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 |
|
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
|
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 |
|
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 |
|
Quddus Chong
|
6c52d51c65
|
am bbe5effb: docs: Fixed typo in \'Authorizing with Google for REST APIs\' doc. bug: 18025533
* commit 'bbe5effb6682b4ba5e6accd9a226ec7611fe83dc':
docs: Fixed typo in 'Authorizing with Google for REST APIs' doc. bug: 18025533
|
2015-04-24 23:43:49 +00:00 |
|
Quddus Chong
|
bbe5effb66
|
docs: Fixed typo in 'Authorizing with Google for REST APIs' doc.
bug: 18025533
Change-Id: I6379b2a7be495a506e0e428fe9c68fdbe197704b
|
2015-04-24 16:29:28 -07:00 |
|
Wale Ogunwale
|
cc9c597dad
|
am d639a453: am e60077e6: Merge "Revert "[ActivityManager] Improve multi-thread access the same provider""
* commit 'd639a4532417bf605f03b3b5efdb3a9e1cbe6661':
Revert "[ActivityManager] Improve multi-thread access the same provider"
|
2015-04-24 22:26:08 +00:00 |
|
Wale Ogunwale
|
4cdc7e842d
|
am e2047da6: am d9bf2652: Merge "Revert "Clean-up state if we have an exception when acquiring provider""
* commit 'e2047da6f3f21fc702d35b7d1c4e9bb62c963dac':
Revert "Clean-up state if we have an exception when acquiring provider"
|
2015-04-24 22:26:04 +00:00 |
|
Wale Ogunwale
|
d639a45324
|
am e60077e6: Merge "Revert "[ActivityManager] Improve multi-thread access the same provider""
* commit 'e60077e62a441dbcc132b2abb35d998ab48d261c':
Revert "[ActivityManager] Improve multi-thread access the same provider"
|
2015-04-24 22:15:02 +00:00 |
|
Wale Ogunwale
|
e2047da6f3
|
am d9bf2652: Merge "Revert "Clean-up state if we have an exception when acquiring provider""
* commit 'd9bf26522b930a8d5d25f6e28c390e39fee6d0b2':
Revert "Clean-up state if we have an exception when acquiring provider"
|
2015-04-24 22:14:56 +00:00 |
|
Kenny Root
|
6c1af7ea49
|
am 8652bce1: am c71f2648: Merge "frameworks/base: switch to using NativeConstants."
* commit '8652bce13765fb29329df2a4ccca4591bae28de5':
frameworks/base: switch to using NativeConstants.
|
2015-04-24 22:00:56 +00:00 |
|
Wale Ogunwale
|
e60077e62a
|
Merge "Revert "[ActivityManager] Improve multi-thread access the same provider""
|
2015-04-24 21:49:47 +00:00 |
|
Kenny Root
|
8652bce137
|
am c71f2648: Merge "frameworks/base: switch to using NativeConstants."
* commit 'c71f264847eb75d53c0f99e6e1c42a8a1527d3b4':
frameworks/base: switch to using NativeConstants.
|
2015-04-24 21:49:47 +00:00 |
|
Wale Ogunwale
|
d9bf26522b
|
Merge "Revert "Clean-up state if we have an exception when acquiring provider""
|
2015-04-24 21:49:41 +00:00 |
|
Wale Ogunwale
|
1d646128b2
|
Revert "[ActivityManager] Improve multi-thread access the same provider"
This reverts commit 57307b21cbdb261eeca081051ed61540dcf905f8.
Bug: 20091132
|
2015-04-24 14:45:14 -07:00 |
|
Wale Ogunwale
|
67fe0a450c
|
Revert "Clean-up state if we have an exception when acquiring provider"
This reverts commit 73e239bdc9493d81215d5afe739b3ed095686ba2.
Bug: 20091132
|
2015-04-24 14:44:54 -07:00 |
|
Cedric Ho
|
c663d99f00
|
Enable VoiceInteractionService on watch.
Change-Id: I1d23ba55a98f6d68942cc344b4a564ab62285656
|
2015-04-24 14:38:25 -07:00 |
|
Kenny Root
|
c71f264847
|
Merge "frameworks/base: switch to using NativeConstants."
|
2015-04-24 21:26:14 +00:00 |
|
Alex Klyubin
|
f9c14b7d16
|
am b068ae14: am e2b9bb45: Merge "No runtime exceptions during normal use of AndroidKeyStore crypto."
* commit 'b068ae143df2c2f3030da23d7fc130f735975867':
No runtime exceptions during normal use of AndroidKeyStore crypto.
|
2015-04-24 20:35:26 +00:00 |
|
Alex Klyubin
|
b068ae143d
|
am e2b9bb45: Merge "No runtime exceptions during normal use of AndroidKeyStore crypto."
* commit 'e2b9bb45d20102f121660ed361bd4225852a55e0':
No runtime exceptions during normal use of AndroidKeyStore crypto.
|
2015-04-24 20:22:58 +00:00 |
|
Alex Klyubin
|
e2b9bb45d2
|
Merge "No runtime exceptions during normal use of AndroidKeyStore crypto."
|
2015-04-24 20:00:58 +00:00 |
|
Quddus Chong
|
9408959144
|
am 9774e8ab: Merge "docs: Updated What\'s New for GMS v7.3 to remove Maps support for Wear." into lmp-mr1-ub-docs
* commit '9774e8ab0890d694840c883f309916a444b3ee54':
docs: Updated What's New for GMS v7.3 to remove Maps support for Wear.
|
2015-04-24 19:56:39 +00:00 |
|
Quddus Chong
|
9774e8ab08
|
Merge "docs: Updated What's New for GMS v7.3 to remove Maps support for Wear." into lmp-mr1-ub-docs
|
2015-04-24 19:48:04 +00:00 |
|
Scott Rowe
|
eec5463cb9
|
am 5e95a917: am 17c0b254: am ccfedfcc: am 5827af11: am 02e4f2fb: Merge "docs: Supported media protocols, codecs, formats for Android TV" into lmp-docs
* commit '5e95a91707ecd53c1ab0eb688513a2328271f9a2':
docs: Supported media protocols, codecs, formats for Android TV
|
2015-04-24 18:52:35 +00:00 |
|
Scott Rowe
|
5e95a91707
|
am 17c0b254: am ccfedfcc: am 5827af11: am 02e4f2fb: Merge "docs: Supported media protocols, codecs, formats for Android TV" into lmp-docs
* commit '17c0b25441a264efe87ab2db82c04c0e018c178c':
docs: Supported media protocols, codecs, formats for Android TV
|
2015-04-24 18:43:03 +00:00 |
|
Scott Rowe
|
17c0b25441
|
am ccfedfcc: am 5827af11: am 02e4f2fb: Merge "docs: Supported media protocols, codecs, formats for Android TV" into lmp-docs
* commit 'ccfedfccbe63af223027471ea80869d0fb011098':
docs: Supported media protocols, codecs, formats for Android TV
|
2015-04-24 18:30:07 +00:00 |
|
Alex Klyubin
|
edf5454a14
|
am 3167fb4b: am 71223ebe: Merge "Reset AndroidKeyStore Mac and Cipher state when init fails."
* commit '3167fb4b6e190705d21a76b34cc376a89675a6a0':
Reset AndroidKeyStore Mac and Cipher state when init fails.
|
2015-04-24 18:21:22 +00:00 |
|
Olawale Ogunwale
|
3846d3a4c5
|
am 6d856bfb: am cf7d2d95: Merge "[ActivityManager] Avoid orphan ContentProviderRecord."
* commit '6d856bfba5b6ae488d49c4909510cd87000cd922':
[ActivityManager] Avoid orphan ContentProviderRecord.
|
2015-04-24 18:21:19 +00:00 |
|
Leon Scroggins III
|
fddbcd857f
|
am 8be18bbf: am 4c1f70db: am b3523d7f: am 41c458c8: am 67326bcb: am ea2dcda7: am ee35410f: (-s ours) am a7501119: am 69b8e962: Make Bitmap_createFromParcel check the color count. DO NOT MERGE
* commit '8be18bbfc23b768ae3022f988e586871754958ac':
Make Bitmap_createFromParcel check the color count. DO NOT MERGE
|
2015-04-24 18:16:34 +00:00 |
|
Leon Scroggins III
|
38b84b6d76
|
am 60d7c9fc: am 6db29a92: am f828f43f: am 38cf068c: am 16ac8ad7: am 4a6ca672: Make Bitmap_createFromParcel check the color count. DO NOT MERGE
* commit '60d7c9fcbcb80c556689f03c7b00984f94f9912b':
Make Bitmap_createFromParcel check the color count. DO NOT MERGE
|
2015-04-24 18:16:29 +00:00 |
|
Scott Rowe
|
ccfedfccbe
|
am 5827af11: am 02e4f2fb: Merge "docs: Supported media protocols, codecs, formats for Android TV" into lmp-docs
* commit '5827af11bdcd9973afe04cb035e83c6428d1e562':
docs: Supported media protocols, codecs, formats for Android TV
|
2015-04-24 18:16:26 +00:00 |
|
Alex Klyubin
|
3167fb4b6e
|
am 71223ebe: Merge "Reset AndroidKeyStore Mac and Cipher state when init fails."
* commit '71223ebe1b2264b7463a02c8dafd779eb3b8c210':
Reset AndroidKeyStore Mac and Cipher state when init fails.
|
2015-04-24 18:11:50 +00:00 |
|
Olawale Ogunwale
|
6d856bfba5
|
am cf7d2d95: Merge "[ActivityManager] Avoid orphan ContentProviderRecord."
* commit 'cf7d2d95adb358a628c2622b43a999d3ab784406':
[ActivityManager] Avoid orphan ContentProviderRecord.
|
2015-04-24 18:11:29 +00:00 |
|