190014 Commits

Author SHA1 Message Date
Quddus Chong
41df3b4b4f am ab52769b: am 789c5971: (-s ours) Merge "docs: Added What\'s New section for GMS v7.3 (Parmesan)." into lmp-docs
* commit 'ab52769be2d2dc33a520459194f1e007f03970e4':
2015-04-27 07:49:29 +00:00
Luan Nguyen
0233b9aa46 am 4f50a2b1: am 33ac358a: docs: Add Wear Capability training
* commit '4f50a2b173e31accd8f1fbdde7e9b038914746e7':
2015-04-27 07:49:23 +00:00
Luan Nguyen
bcfee8112a am bed3f49b: am 4aebbfbb: Merge "docs: Add Channel API summary for Wear." into lmp-docs
* commit 'bed3f49b5547642c76901d848c08163463ab4fbe':
2015-04-27 07:49:16 +00:00
Quddus Chong
c141efed1b am 9c8f8117: am 900831f3: docs: Added 3rd-party Javadocs for Android Support Testing Library v0.2. bug: 20304402
* commit '9c8f8117c1ed2fbf2181011116287b5f6c6dbe9d':
2015-04-27 07:49:10 +00:00
Ryosuke Matsuuchi
ed6c8ff17f am 3cd98ab6: am 0d2f2803: Merge "doc: Add Korean version of DAC/distribute/ page." into lmp-docs
* commit '3cd98ab63cf4bee489de9077e62c93a13f9e66b2':
2015-04-27 07:49:03 +00:00
Dirk Dougherty
7f2bdf885d am d668578f: am ff233af7: Merge "Doc change: distribute landing page." into lmp-docs
* commit 'd668578f6f7a5623bc88afa1e39bb19ede91879e':
2015-04-27 07:48:52 +00:00
Rich Slogar
74c574027c am 03389e7e: am 1fcc6bd8: Merge "docs: studio remove gradle tasks dialog" into lmp-docs
* commit '03389e7e4a74a92b6bcae5474e9b2c887ac2d335':
2015-04-27 07:48:44 +00:00
Rich Slogar
4b79a1477d am 5fb293b2: am efe861a4: Merge "docs: hierarchyviewer updates" into lmp-docs
* commit '5fb293b27d71cc1b8949179c30d43fc057ae05fb':
2015-04-27 07:48:37 +00:00
Geoff Mendal
a818a46c89 Merge "Import translations. DO NOT MERGE" into mnc-dev 2015-04-27 01:52:37 +00:00
Geoff Mendal
f1facef1fb Import translations. DO NOT MERGE
Change-Id: I88ab579013a6824872195c6c7714055462d63340
Auto-generated-cl: translation import
2015-04-26 18:47:08 -07:00
Geoff Mendal
694a55b67b Merge "Import translations. DO NOT MERGE" into mnc-dev 2015-04-27 01:43:34 +00:00
Geoff Mendal
9648cb6ee5 Import translations. DO NOT MERGE
Change-Id: Id361b7e87a85cb100addc326bc74ce7db4ba10f2
Auto-generated-cl: translation import
2015-04-26 18:32:53 -07:00
Geoff Mendal
df9fd7c839 Import translations. DO NOT MERGE
Change-Id: I9acb57cbfcf1d50e6380c6c5ee091fe49912f43e
Auto-generated-cl: translation import
2015-04-26 18:29:43 -07:00
Scott Rowe
6360428359 am 02e4f2fb: Merge "docs: Supported media protocols, codecs, formats for Android TV" into lmp-docs
* commit '02e4f2fbe6e0511789d42d5942548158d2dd154f':
  docs: Supported media protocols, codecs, formats for Android TV
2015-04-26 22:08:07 +00:00
Andrew Solovay
44199d26d2 am 5b3152cf: Merge "Docs: Correcting section on how to escape quotes in strings." into lmp-docs
* commit '5b3152cffcd90441ca4cacdf5596e9bb3428af08':
  Docs: Correcting section on how to escape quotes in strings.
2015-04-26 22:07:52 +00:00
Andrew Solovay
19bc81dbba am 09cf4d50: Merge "docs: Update to doc on listening for restrictions-changed intent" into lmp-docs
* commit '09cf4d500dd27342c913d2333f4f0fd2fa9dbfd0':
  docs: Update to doc on listening for restrictions-changed intent
2015-04-26 22:07:44 +00:00
Quddus Chong
a76a3dd3a9 am f0936e2f: (-s ours) Merge "docs: Added 3rd-party Javadocs for GMS Parmesan release." into lmp-docs
* commit 'f0936e2fb0e9f013f6079e7a733a41d42d49c3f3':
  docs: Added 3rd-party Javadocs for GMS Parmesan release.
2015-04-26 22:07:38 +00:00
Quddus Chong
ab52769be2 am 789c5971: (-s ours) Merge "docs: Added What\'s New section for GMS v7.3 (Parmesan)." into lmp-docs
* commit '789c59711e55be981ed2093228ded0c588e74ba0':
  docs: Added What's New section for GMS v7.3 (Parmesan).
2015-04-26 22:00:29 +00:00
Luan Nguyen
4f50a2b173 am 33ac358a: docs: Add Wear Capability training
* commit '33ac358a5a4199549d11ba1931243e7dc8a7ab85':
  docs: Add Wear Capability training
2015-04-26 19:15:52 +00:00
Luan Nguyen
bed3f49b55 am 4aebbfbb: Merge "docs: Add Channel API summary for Wear." into lmp-docs
* commit '4aebbfbb9ba54d77ac99508fb66db6c9fd24343a':
  docs: Add Channel API summary for Wear.
2015-04-26 19:15:46 +00:00
Quddus Chong
9c8f8117c1 am 900831f3: docs: Added 3rd-party Javadocs for Android Support Testing Library v0.2. bug: 20304402
* commit '900831f303beb4a67a871d969ac822d8b6d36460':
  docs: Added 3rd-party Javadocs for Android Support Testing Library v0.2. bug: 20304402
2015-04-26 19:15:39 +00:00
Ryosuke Matsuuchi
3cd98ab63c am 0d2f2803: Merge "doc: Add Korean version of DAC/distribute/ page." into lmp-docs
* commit '0d2f280310458d23618edf6550818f8f9cfa6b47':
  doc: Add Korean version of DAC/distribute/ page.
2015-04-26 19:15:26 +00:00
Dirk Dougherty
d668578f6f am ff233af7: Merge "Doc change: distribute landing page." into lmp-docs
* commit 'ff233af75f2201c2724f8b388c39d3abeb8c6a2e':
  Doc change: distribute landing page.
2015-04-26 19:15:20 +00:00
Rich Slogar
03389e7e4a am 1fcc6bd8: Merge "docs: studio remove gradle tasks dialog" into lmp-docs
* commit '1fcc6bd854f6e152cf8796a4a70965e350c3bdcf':
  docs: studio remove gradle tasks dialog
2015-04-26 19:15:12 +00:00
Rich Slogar
5fb293b27d am efe861a4: Merge "docs: hierarchyviewer updates" into lmp-docs
* commit 'efe861a4a7081da795fe6a0843308ca7cef26277':
  docs: hierarchyviewer updates
2015-04-26 19:15:04 +00:00
Dirk Dougherty
d8269c0cc8 am 2a8ef256: am 495227aa: Doc change: update dff image.
* commit '2a8ef2563042e2db93960ace529a2986c289d3dc':
  Doc change: update dff image.
2015-04-25 22:05:38 +00:00
Nick Kralevich
2eb10c0075 am 05ad674a: am 00e165ae: am e8101c04: Merge "fix compiler error under FORTIFY_SOURCE=2"
* commit '05ad674aa888e3f9217de0e5c3176161dd8e31aa':
  fix compiler error under FORTIFY_SOURCE=2
2015-04-25 22:05:25 +00:00
Dirk Dougherty
2a8ef25630 am 495227aa: Doc change: update dff image.
* commit '495227aab706fa6daf7f7b0b4ca741fef82c9d1d':
  Doc change: update dff image.
2015-04-25 21:59:35 +00:00
Nick Kralevich
05ad674aa8 am 00e165ae: am e8101c04: Merge "fix compiler error under FORTIFY_SOURCE=2"
* commit '00e165aed3d53b147b153003b3b9fd3c129ff3c4':
  fix compiler error under FORTIFY_SOURCE=2
2015-04-25 21:56:56 +00:00
Dirk Dougherty
495227aab7 Doc change: update dff image.
Bug-id: 20251587

Change-Id: I25d59c8a66c548a13e699c25e79cd4a23d2cd330
2015-04-25 21:53:05 +00:00
Nick Kralevich
00e165aed3 am e8101c04: Merge "fix compiler error under FORTIFY_SOURCE=2"
* commit 'e8101c047cffc69245493d96f2f2ec36728682f1':
  fix compiler error under FORTIFY_SOURCE=2
2015-04-25 21:41:52 +00:00
Nick Kralevich
e8101c047c Merge "fix compiler error under FORTIFY_SOURCE=2" 2015-04-25 21:22:32 +00:00
Andreas Gampe
0f94fc6f1d Merge "Frameworks/base: Fix a constructor" 2015-04-25 20:16:12 +00:00
Geoff Mendal
4b57e74bb3 Merge "Import translations. DO NOT MERGE" 2015-04-25 09:28:10 +00:00
Geoff Mendal
50fecbcfe6 Merge "Import translations. DO NOT MERGE" 2015-04-25 09:16:32 +00:00
Geoff Mendal
2a074104ea Merge "Import translations. DO NOT MERGE" 2015-04-25 09:12:38 +00:00
Geoff Mendal
3c4566285b Import translations. DO NOT MERGE
Change-Id: I1b40f02313d2014862d8eafd30cdff02255c9564
Auto-generated-cl: translation import
2015-04-25 01:55:11 -07:00
Geoff Mendal
7d12285130 Import translations. DO NOT MERGE
Change-Id: Id8f27460d1cbdb97a9843a21d531f0b03ab72505
Auto-generated-cl: translation import
2015-04-25 00:23:36 -07:00
Geoff Mendal
f748bb3051 Import translations. DO NOT MERGE
Change-Id: Ic375b06aab79b9b7d17754eba4dd9d182a669734
Auto-generated-cl: translation import
2015-04-24 23:58:45 -07:00
Geoff Mendal
c9f5cb8caf Import translations. DO NOT MERGE
Change-Id: I79db3fdb8e2c5e86259a6c5cefe5e0790a07bc92
Auto-generated-cl: translation import
2015-04-24 23:44:04 -07:00
Nick Kralevich
9709a1f04c fix compiler error under FORTIFY_SOURCE=2
frameworks/base/libs/androidfw/ObbFile.cpp:340:5: error: ignoring return value of function declared with warn_unused_result attribute [-Werror,-Wunused-result]
    ftruncate(fd, mFooterStart);
    ^~~~~~~~~ ~~~~~~~~~~~~~~~~
1 error generated.
amake: *** [out/host/linux-x86/obj/STATIC_LIBRARIES/libandroidfw_intermediates/ObbFile.o] Error 1

Change-Id: I7080d64e7a830a10b41c1ebf33c60d32b7c8356e
2015-04-24 20:27:06 -07:00
Selim Cinek
e39e17dff7 Merge "Improve the falsing logic for unlock motion" 2015-04-25 02:12:52 +00:00
Selim Cinek
9db71054b8 Improve the falsing logic for unlock motion
Bug: 20563134
Change-Id: I628829915ad2cc7f1df5d0c971def44f6eacdae4
2015-04-24 19:11:58 -07:00
Etan Cohen
f2570cb595 Merge "Doc fix - incorrect format (included argument) for function reference." 2015-04-25 01:44:27 +00:00
Etan Cohen
912270e22d Doc fix - incorrect format (included argument) for function reference.
Change-Id: I2cdf7b4f078b1ab0556fcc3fad5287f86641c396
2015-04-24 18:43:41 -07:00
Aravind Akella
398e11837b Merge "Add hidden SensorManager APIs for injecting sensor data." 2015-04-25 01:40:26 +00:00
Andy Hung
09f9a7adb3 Merge "Hide stretch mode from PlaybackSettings" 2015-04-25 01:28:47 +00:00
Adam Lesinski
58ffaf9061 Merge "Properly mangle file names" 2015-04-25 01:21:00 +00:00
Julia Reynolds
f7d3a766f0 Merge "Only skip unrecognized tags." 2015-04-25 01:09:25 +00:00
Etan Cohen
4e4fec1b8d Merge "Fix documentation - non-public API." 2015-04-25 01:08:11 +00:00