OSDN Git Service
Jean-Michel Trivi [Tue, 25 Nov 2014 17:49:46 +0000 (17:49 +0000)]
am
213472d7: am
8c816096: Merge "Add support for audio focus locking" into lmp-mr1-dev
* commit '
213472d7384c9d8096748f3cd9305ef49342dbcf':
Add support for audio focus locking
Jeff Davidson [Tue, 25 Nov 2014 17:49:39 +0000 (17:49 +0000)]
am
6fdf2a17: am
6ea4e11d: Merge "Don\'t enforce control permission when preparing consented VPN." into lmp-mr1-dev
* commit '
6fdf2a1709c2006275d148e3156d249dcc27a99c':
Don't enforce control permission when preparing consented VPN.
Jinsuk Kim [Tue, 25 Nov 2014 17:49:34 +0000 (17:49 +0000)]
am
c27f5baa: am
51cb7aa7: Merge "CEC: Do not issue non-effective <Routing Change>" into lmp-mr1-dev
* commit '
c27f5baaeb39137b7cedc7c36feaaa1a67b1d3a3':
CEC: Do not issue non-effective <Routing Change>
Geoff Mendal [Tue, 25 Nov 2014 17:49:28 +0000 (17:49 +0000)]
am
6a0ec6e6: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-mr1-ub-dev
* commit '
6a0ec6e60616811bb19a25ce79c74361968642c4':
Import translations. DO NOT MERGE
Geoff Mendal [Tue, 25 Nov 2014 17:49:14 +0000 (17:49 +0000)]
am
db3b7b58: (-s ours) am
597226d6: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-mr1-dev
* commit '
db3b7b5846d3a047d5a049fd1f931b8a87b46b68':
Import translations. DO NOT MERGE
Jeff Sharkey [Tue, 25 Nov 2014 17:39:16 +0000 (17:39 +0000)]
am
58b699c3: am
636baa0d: Merge "Introduce revision codes for split APKs." into lmp-mr1-dev
* commit '
58b699c366dea7abc26f34c1e5f1cc6031c04e23':
Introduce revision codes for split APKs.
Sailesh Nepal [Tue, 25 Nov 2014 17:38:32 +0000 (17:38 +0000)]
am
8c2a8f64: am
0afd49a1: Merge "Add system API to get registered connection managers" into lmp-mr1-dev
* commit '
8c2a8f64b9c150b8e8422c5e97ca5d491b6fc93b':
Add system API to get registered connection managers
Jorim Jaggi [Tue, 25 Nov 2014 17:38:26 +0000 (17:38 +0000)]
am
82bb648b: am
6b770744: Merge "Fix quick settings on Keyguard" into lmp-mr1-dev
* commit '
82bb648b5a1a5a4a0946a252a9cf9b6f8944a15d':
Fix quick settings on Keyguard
Chris Wren [Tue, 25 Nov 2014 17:38:21 +0000 (17:38 +0000)]
am
fa5768ce: am
1b26cc5b: Merge "LED should not be blocked by interruption filtering." into lmp-mr1-dev
* commit '
fa5768cef416d6379cd2a9e687695591add3f8b5':
LED should not be blocked by interruption filtering.
smain@google.com [Tue, 25 Nov 2014 17:38:15 +0000 (17:38 +0000)]
am
f00d46db: am
79b496e8: am
75cd7c74: am
5f3ba993: am
1b23ee96: Merge "add intro videos (w/ shadowbox) to Auto and Wear landing pages." into lmp-docs
* commit '
f00d46db377b97da673f8699928d8343b3bc132d':
add intro videos (w/ shadowbox) to Auto and Wear landing pages.
John Spurlock [Tue, 25 Nov 2014 17:38:02 +0000 (17:38 +0000)]
am
98a20f68: am
4dfce43e: Merge "QS: Update data usage over limit title." into lmp-mr1-dev
* commit '
98a20f68e0f31c43d090b16e3802c67226dbd055':
QS: Update data usage over limit title.
Paul Jensen [Tue, 25 Nov 2014 17:37:54 +0000 (17:37 +0000)]
am
080b02fc: am
e57064a2: Merge "Don\'t bother validating networks that don\'t satisfy the default request." into lmp-mr1-dev
* commit '
080b02fc6c4531646d29ff4039080f2ac6d5f31a':
Don't bother validating networks that don't satisfy the default request.
Geoff Mendal [Tue, 25 Nov 2014 17:37:49 +0000 (17:37 +0000)]
am
5d50bf02: (-s ours) am
44b769d0: (-s ours) am
3a013dab: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-sprout-dev
* commit '
5d50bf02a6f34afd493e4d38f784790e08f6bd7e':
Import translations. DO NOT MERGE
Svet Ganov [Tue, 25 Nov 2014 17:37:42 +0000 (17:37 +0000)]
am
f34896bb: am
c9f499d2: Merge "Print spooler crash when printing after a rotation." into lmp-mr1-dev
* commit '
f34896bbeb49aef3509e55ccf9afc7b62ae4dafd':
Print spooler crash when printing after a rotation.
Amit Mahajan [Tue, 25 Nov 2014 17:37:37 +0000 (17:37 +0000)]
am
ed7ccb45: am
77348365: Merge "Set network selection to automatic when in Global mode" into lmp-mr1-dev
* commit '
ed7ccb45c0ffe5de22af68904ddba4f515eb3f10':
Set network selection to automatic when in Global mode
John Reck [Tue, 25 Nov 2014 17:37:31 +0000 (17:37 +0000)]
am
c68728f5: am
b059ff81: am
2b36a86b: Wire up surface width/height to lockHardwareCanvas DO NOT MERGE
* commit '
c68728f5e97b0f354c00710f2359207d14ef784c':
Wire up surface width/height to lockHardwareCanvas DO NOT MERGE
Dianne Hackborn [Tue, 25 Nov 2014 17:36:58 +0000 (17:36 +0000)]
am
d65cb228: am
2bbea56d: Merge "Final resource IDs." into lmp-mr1-dev
* commit '
d65cb22872b5dbfb5937d66191b60be22b63fd21':
Final resource IDs.
Dianne Hackborn [Tue, 25 Nov 2014 17:36:52 +0000 (17:36 +0000)]
am
608439df: am
5bbb1af7: Merge "Work on issue #
18486438: Reduce size of bugreport output" into lmp-mr1-dev
* commit '
608439df383b40dc0f808e4992b369debaff29cd':
Work on issue #
18486438: Reduce size of bugreport output
Jeff Brown [Tue, 25 Nov 2014 15:10:26 +0000 (15:10 +0000)]
am
8cac7309: am
b5686d55: am
3d110b23: Make WallpaperService watch the actual display state.
* commit '
8cac73097e3695d22e3529e77048d82f7fa0fb1c':
Make WallpaperService watch the actual display state.
Sreeram Ramachandran [Tue, 25 Nov 2014 15:10:20 +0000 (15:10 +0000)]
am
608ea322: am
6d0e8711: Merge "Delete unused/non-working code." into lmp-mr1-dev
* commit '
608ea322868385aaa46c20887795e72bf7068479':
Delete unused/non-working code.
Sreeram Ramachandran [Tue, 25 Nov 2014 15:10:14 +0000 (15:10 +0000)]
am
4096a310: am
45e27327: Merge "Allow VPNs to specify their underlying networks." into lmp-mr1-dev
* commit '
4096a3107b070339ba06102a32a368f28a31f9a4':
Allow VPNs to specify their underlying networks.
Sreeram Ramachandran [Tue, 25 Nov 2014 15:10:08 +0000 (15:10 +0000)]
am
1d16570b: am
aaea7e81: Merge "Eliminate race conditions in UID-based network filtering." into lmp-mr1-dev
* commit '
1d16570b374ffaea89a3e3d403146008d12e60b9':
Eliminate race conditions in UID-based network filtering.
Geoff Mendal [Tue, 25 Nov 2014 15:09:56 +0000 (15:09 +0000)]
am
1df8d4c5: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-mr1-ub-dev
* commit '
1df8d4c5e09e0fc06d7c4a6d313e01906ea4d25e':
Import translations. DO NOT MERGE
Jorim Jaggi [Tue, 25 Nov 2014 15:09:46 +0000 (15:09 +0000)]
am
fc4d8043: am
f510a8a6: Merge "Tint SIM images in PIN/PUK screen" into lmp-mr1-dev
* commit '
fc4d8043ded6f8ef5dcf6ffdcb9f2f40c1c369f5':
Tint SIM images in PIN/PUK screen
Adrian Roos [Tue, 25 Nov 2014 15:09:39 +0000 (15:09 +0000)]
am
20eb594a: am
8a924242: Merge "Revert "Only keep user switcher bitmaps if needed"" into lmp-mr1-dev
* commit '
20eb594ab27a9e4dee83574b3fe36a5a6d0d7807':
Revert "Only keep user switcher bitmaps if needed"
Adrian Roos [Tue, 25 Nov 2014 15:09:33 +0000 (15:09 +0000)]
am
9b4b2940: am
07361c84: Merge "Follow up to I96c68af9ccc9940acf9fab3b5bd39a3485f01045" into lmp-mr1-dev
* commit '
9b4b2940b7697e626200a7ab82fbfa3bf99174fc':
Follow up to I96c68af9ccc9940acf9fab3b5bd39a3485f01045
Adrian Roos [Tue, 25 Nov 2014 15:09:24 +0000 (15:09 +0000)]
am
520d20c1: am
702d9e31: Merge "Fix DPM.resetPassword("")" into lmp-mr1-dev
* commit '
520d20c1a8c2fbd0d6b7fdc19415167a6f45c866':
Fix DPM.resetPassword("")
Christoph Studer [Tue, 25 Nov 2014 15:09:18 +0000 (15:09 +0000)]
am
30646d87: am
67142495: Merge "Fix MediaStyle API comments" into lmp-mr1-dev
* commit '
30646d87f240cd17917ad6d1ae83306d284b58b5':
Fix MediaStyle API comments
Chris Wren [Tue, 25 Nov 2014 15:09:12 +0000 (15:09 +0000)]
am
865c73b5: am
1aa63f0b: Merge "Push back notification means snooze the package." into lmp-mr1-dev
* commit '
865c73b5f66bfd1e5a9eded75b5a5fb24e701042':
Push back notification means snooze the package.
Geoff Mendal [Tue, 25 Nov 2014 15:08:52 +0000 (15:08 +0000)]
am
41d3e943: (-s ours) am
ae71b002: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-mr1-dev
* commit '
41d3e943a7245c4a95095027a52224acef174758':
Import translations. DO NOT MERGE
Geoff Mendal [Tue, 25 Nov 2014 15:08:46 +0000 (15:08 +0000)]
am
c3ab889f: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-mr1-ub-dev
* commit '
c3ab889f9eda2a6307cc7ef82a626ec66522472a':
Import translations. DO NOT MERGE
Geoff Mendal [Tue, 25 Nov 2014 15:08:39 +0000 (15:08 +0000)]
am
c6a1070b: (-s ours) am
9be80ee5: (-s ours) Import translations. DO NOT MERGE
* commit '
c6a1070bd64bb7eb6cd13c6e3fdb0d33ab19d1f0':
Import translations. DO NOT MERGE
Zoltan Szatmary-Ban [Tue, 25 Nov 2014 15:08:08 +0000 (15:08 +0000)]
am
8e55c4bf: am
604aec95: Merge "Add new subcommand \'set-active-admin\' to the dpm command." into lmp-mr1-dev
* commit '
8e55c4bff83af7eea3212bc9ff6a254ac70139fd':
Add new subcommand 'set-active-admin' to the dpm command.
Jorim Jaggi [Tue, 25 Nov 2014 14:34:56 +0000 (15:34 +0100)]
resolved conflicts for merge of
f0fc23a1 to lmp-mr1-dev-plus-aosp
Change-Id: I8f1dbae2ecd14ae4e51a9e86eb6d36dd56a48be1
Jean-Michel Trivi [Mon, 24 Nov 2014 21:44:21 +0000 (21:44 +0000)]
am
8c816096: Merge "Add support for audio focus locking" into lmp-mr1-dev
* commit '
8c81609616498b382d61d08371c547d644fa0709':
Add support for audio focus locking
Jean-Michel Trivi [Mon, 24 Nov 2014 21:39:28 +0000 (21:39 +0000)]
Merge "Add support for audio focus locking" into lmp-mr1-dev
Jeff Davidson [Mon, 24 Nov 2014 21:25:41 +0000 (21:25 +0000)]
am
6ea4e11d: Merge "Don\'t enforce control permission when preparing consented VPN." into lmp-mr1-dev
* commit '
6ea4e11d9817d85eb5c0ff445154985e4eb0c534':
Don't enforce control permission when preparing consented VPN.
Jinsuk Kim [Mon, 24 Nov 2014 21:21:12 +0000 (21:21 +0000)]
am
51cb7aa7: Merge "CEC: Do not issue non-effective <Routing Change>" into lmp-mr1-dev
* commit '
51cb7aa774cf6ab7727928d136052c61325a8031':
CEC: Do not issue non-effective <Routing Change>
Jeff Davidson [Mon, 24 Nov 2014 21:19:55 +0000 (21:19 +0000)]
Merge "Don't enforce control permission when preparing consented VPN." into lmp-mr1-dev
Geoff Mendal [Mon, 24 Nov 2014 21:15:28 +0000 (21:15 +0000)]
Merge "Import translations. DO NOT MERGE" into lmp-mr1-ub-dev
Jinsuk Kim [Mon, 24 Nov 2014 21:13:58 +0000 (21:13 +0000)]
Merge "CEC: Do not issue non-effective <Routing Change>" into lmp-mr1-dev
Geoff Mendal [Mon, 24 Nov 2014 20:49:28 +0000 (20:49 +0000)]
am
597226d6: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-mr1-dev
* commit '
597226d6f2adb3fd70d669e168a2d6171222ad1a':
Import translations. DO NOT MERGE
Geoff Mendal [Mon, 24 Nov 2014 20:44:48 +0000 (20:44 +0000)]
Merge "Import translations. DO NOT MERGE" into lmp-mr1-dev
Jeff Sharkey [Mon, 24 Nov 2014 20:20:10 +0000 (20:20 +0000)]
am
636baa0d: Merge "Introduce revision codes for split APKs." into lmp-mr1-dev
* commit '
636baa0d2451a531f8e83f5cdfc0d709989c4862':
Introduce revision codes for split APKs.
Jeff Sharkey [Mon, 24 Nov 2014 20:16:12 +0000 (20:16 +0000)]
Merge "Introduce revision codes for split APKs." into lmp-mr1-dev
Jeff Sharkey [Sun, 23 Nov 2014 00:49:34 +0000 (16:49 -0800)]
Introduce revision codes for split APKs.
Apps delivered as multiple split APKs must have identical package
names, version code, and signatures. However, developers may want
to iterate quickly on a subset of splits without having to increment
the version code, which would require delivery of the entire app.
This change introduces "revision codes" which can vary between
split APKs belonging to the same app. An install is valid as long
as the normal version code is identical across all splits. Splits
can be added/removed to an app over time, but if a split is present
across an upgrade the revision code must not decrease.
Since system apps could have been updated with splits, only revert
to the built-in APKs if the version code is strictly greater than the
data version. Also fix bug to enable inheriting from system apps
when adding splits.
Bug:
18481866
Change-Id: I34d8e14c141a8eb95c33ffe24b4e52d6af5c8260
Sailesh Nepal [Mon, 24 Nov 2014 20:01:25 +0000 (20:01 +0000)]
am
0afd49a1: Merge "Add system API to get registered connection managers" into lmp-mr1-dev
* commit '
0afd49a1721a5fd71ecf69e6bc62cdb3c8591341':
Add system API to get registered connection managers
Jorim Jaggi [Mon, 24 Nov 2014 20:01:19 +0000 (20:01 +0000)]
am
6b770744: Merge "Fix quick settings on Keyguard" into lmp-mr1-dev
* commit '
6b77074438f191de4fcfa1f1560fb5f038cb8173':
Fix quick settings on Keyguard
Chris Wren [Mon, 24 Nov 2014 20:00:55 +0000 (20:00 +0000)]
am
1b26cc5b: Merge "LED should not be blocked by interruption filtering." into lmp-mr1-dev
* commit '
1b26cc5b7ab5733b94741f17c84eb4b140eaf045':
LED should not be blocked by interruption filtering.
smain@google.com [Mon, 24 Nov 2014 20:00:50 +0000 (20:00 +0000)]
am
79b496e8: am
75cd7c74: am
5f3ba993: am
1b23ee96: Merge "add intro videos (w/ shadowbox) to Auto and Wear landing pages." into lmp-docs
* commit '
79b496e867f15529e442bbd19f6d0a75bf3f9f38':
add intro videos (w/ shadowbox) to Auto and Wear landing pages.
Sailesh Nepal [Mon, 24 Nov 2014 19:36:56 +0000 (19:36 +0000)]
Merge "Add system API to get registered connection managers" into lmp-mr1-dev
Jorim Jaggi [Mon, 24 Nov 2014 19:31:28 +0000 (19:31 +0000)]
Merge "Fix quick settings on Keyguard" into lmp-mr1-dev
Jorim Jaggi [Fri, 21 Nov 2014 17:10:32 +0000 (18:10 +0100)]
Fix quick settings on Keyguard
- Fix that quick settings couldn't be scrolled nor closed on Keyguard
if scrolling was needed.
- Fix jumping in unlock motion when closing both panel and QS
- Fix invalid panel height when closing both QS and panel
Bug:
18481668
Change-Id: Ifd12e29bbc64f72f0dc13b43e36b1a57df7524fa
Geoff Mendal [Mon, 24 Nov 2014 19:28:36 +0000 (11:28 -0800)]
Import translations. DO NOT MERGE
Change-Id: Ia5a03d8dd7c8d82c4f65421b1b2985bdffceee19
Auto-generated-cl: translation import
Geoff Mendal [Mon, 24 Nov 2014 19:21:09 +0000 (11:21 -0800)]
Import translations. DO NOT MERGE
Change-Id: I753b271eb5b97b719fe6d4aa50d21431a961d553
Auto-generated-cl: translation import
Chris Wren [Mon, 24 Nov 2014 19:15:47 +0000 (19:15 +0000)]
Merge "LED should not be blocked by interruption filtering." into lmp-mr1-dev
smain@google.com [Mon, 24 Nov 2014 19:11:04 +0000 (19:11 +0000)]
am
75cd7c74: am
5f3ba993: am
1b23ee96: Merge "add intro videos (w/ shadowbox) to Auto and Wear landing pages." into lmp-docs
* commit '
75cd7c74ab38a55914f1658234a0031c907eb3ed':
add intro videos (w/ shadowbox) to Auto and Wear landing pages.
smain@google.com [Mon, 24 Nov 2014 19:02:34 +0000 (19:02 +0000)]
am
5f3ba993: am
1b23ee96: Merge "add intro videos (w/ shadowbox) to Auto and Wear landing pages." into lmp-docs
* commit '
5f3ba99376a7d01a4d142f2e34576202870b0a46':
add intro videos (w/ shadowbox) to Auto and Wear landing pages.
smain@google.com [Mon, 24 Nov 2014 18:55:57 +0000 (18:55 +0000)]
am
1b23ee96: Merge "add intro videos (w/ shadowbox) to Auto and Wear landing pages." into lmp-docs
* commit '
1b23ee962a1ce0963537810724b2be61c0ab8c57':
add intro videos (w/ shadowbox) to Auto and Wear landing pages.
smain@google.com [Mon, 24 Nov 2014 18:51:02 +0000 (18:51 +0000)]
Merge "add intro videos (w/ shadowbox) to Auto and Wear landing pages." into lmp-docs
John Spurlock [Mon, 24 Nov 2014 18:48:59 +0000 (18:48 +0000)]
am
4dfce43e: Merge "QS: Update data usage over limit title." into lmp-mr1-dev
* commit '
4dfce43e976a294b3b575564c855214a8e5cef58':
QS: Update data usage over limit title.
Jean-Michel Trivi [Sun, 16 Nov 2014 23:40:22 +0000 (15:40 -0800)]
Add support for audio focus locking
New API for a registered AudioPolicy to lock/unlock the audio
focus stack and prevent any new grant of focus, similar to
the way phone calls behave.
Bug
16010554
Change-Id: If34a58ca9bd43d5479e94a2a7b540750b4c6efe9
Paul Jensen [Mon, 24 Nov 2014 18:36:27 +0000 (18:36 +0000)]
am
e57064a2: Merge "Don\'t bother validating networks that don\'t satisfy the default request." into lmp-mr1-dev
* commit '
e57064a289082758fcb9bb71f987dde84931e3e6':
Don't bother validating networks that don't satisfy the default request.
John Spurlock [Mon, 24 Nov 2014 18:34:55 +0000 (18:34 +0000)]
Merge "QS: Update data usage over limit title." into lmp-mr1-dev
Geoff Mendal [Mon, 24 Nov 2014 18:32:14 +0000 (18:32 +0000)]
am
44b769d0: (-s ours) am
3a013dab: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-sprout-dev
* commit '
44b769d0103df57ccf16f84e037af7d44950aa0a':
Import translations. DO NOT MERGE
Paul Jensen [Mon, 24 Nov 2014 18:30:34 +0000 (18:30 +0000)]
Merge "Don't bother validating networks that don't satisfy the default request." into lmp-mr1-dev
Svet Ganov [Mon, 24 Nov 2014 18:27:52 +0000 (18:27 +0000)]
am
c9f499d2: Merge "Print spooler crash when printing after a rotation." into lmp-mr1-dev
* commit '
c9f499d2f1cd598b90bfb8c13e505354555caea8':
Print spooler crash when printing after a rotation.
Amit Mahajan [Mon, 24 Nov 2014 18:27:46 +0000 (18:27 +0000)]
am
77348365: Merge "Set network selection to automatic when in Global mode" into lmp-mr1-dev
* commit '
77348365088577fd760c9d18f488c30dcc2fe1c2':
Set network selection to automatic when in Global mode
John Reck [Mon, 24 Nov 2014 18:27:41 +0000 (18:27 +0000)]
am
b059ff81: am
2b36a86b: Wire up surface width/height to lockHardwareCanvas DO NOT MERGE
* commit '
b059ff81570247f8c00098c68ffafcbf98941d54':
Wire up surface width/height to lockHardwareCanvas DO NOT MERGE
Geoff Mendal [Mon, 24 Nov 2014 18:24:23 +0000 (18:24 +0000)]
am
3a013dab: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-sprout-dev
* commit '
3a013dab155acafab6a80e6b13a82252b69abd9f':
Import translations. DO NOT MERGE
Svet Ganov [Mon, 24 Nov 2014 18:23:34 +0000 (18:23 +0000)]
Merge "Print spooler crash when printing after a rotation." into lmp-mr1-dev
Amit Mahajan [Mon, 24 Nov 2014 18:21:54 +0000 (18:21 +0000)]
Merge "Set network selection to automatic when in Global mode" into lmp-mr1-dev
John Reck [Mon, 24 Nov 2014 18:19:45 +0000 (18:19 +0000)]
am
2b36a86b: Wire up surface width/height to lockHardwareCanvas DO NOT MERGE
* commit '
2b36a86b8ee4e8c0952494dd17b5e96ded22f2ee':
Wire up surface width/height to lockHardwareCanvas DO NOT MERGE
Geoff Mendal [Mon, 24 Nov 2014 18:18:13 +0000 (18:18 +0000)]
Merge "Import translations. DO NOT MERGE" into lmp-sprout-dev
Wink Saville [Mon, 24 Nov 2014 18:06:09 +0000 (18:06 +0000)]
am
4f1cce63: am
12c2136e: Merge "Additional changes to SubscriptionManager API as per API council." into lmp-mr1-dev
* commit '
4f1cce63061976490e2e2cfc4085e1634d3a02de':
Additional changes to SubscriptionManager API as per API council.
Lajos Molnar [Mon, 24 Nov 2014 18:05:46 +0000 (18:05 +0000)]
am
63845f1b: am
c398f175: Merge "media: fix isSupportedFormat for integer frame rate" into lmp-mr1-dev
* commit '
63845f1b5853aa3a84df4a161f6c8e96b98fba8a':
media: fix isSupportedFormat for integer frame rate
Eino-Ville Talvala [Mon, 24 Nov 2014 18:05:40 +0000 (18:05 +0000)]
am
e289082a: am
dfa99f63: Merge "Camera: Add new capability flags as system features as well" into lmp-mr1-dev
* commit '
e289082a7066a86032190aa100425ce29cd2a4f2':
Camera: Add new capability flags as system features as well
RoboErik [Mon, 24 Nov 2014 18:05:31 +0000 (18:05 +0000)]
am
74086d44: am
a08adb24: Fix binder equality check
* commit '
74086d44ff5c0d8c194ab745fedf2121eba1c8d5':
Fix binder equality check
Joe Fernandez [Mon, 24 Nov 2014 18:05:17 +0000 (18:05 +0000)]
am
0c7d2d2f: am
85f463c5: am
fbdfdef4: am
9034ead0: am
5b94d00b: docs: URGENT Removing Chinese Lollipop translations, fixing zh-cn resources
* commit '
0c7d2d2fa8ce801d608db2da6670d10720eaea16':
docs: URGENT Removing Chinese Lollipop translations, fixing zh-cn resources
Scott Rowe [Mon, 24 Nov 2014 18:05:11 +0000 (18:05 +0000)]
am
9e9d1cd3: am
a505d0be: am
63108ee3: am
02cb1fe6: am
14f78ed7: Merge "docs: b/
17996176 [DAC-review-bug] Update Hardware Accelerated Table to API 21 Change-Id: I3bb972cc1defd3e6fa6295664e41311b85698f31" into lmp-docs
* commit '
9e9d1cd3ff536e8c9d00469f01b00b94fe73e0a2':
docs: b/
17996176 [DAC-review-bug] Update Hardware Accelerated Table to API 21 Change-Id: I3bb972cc1defd3e6fa6295664e41311b85698f31
Dianne Hackborn [Mon, 24 Nov 2014 17:59:48 +0000 (17:59 +0000)]
am
2bbea56d: Merge "Final resource IDs." into lmp-mr1-dev
* commit '
2bbea56d1258f7b55183ddba6364815f17aafe88':
Final resource IDs.
Dianne Hackborn [Mon, 24 Nov 2014 17:59:43 +0000 (17:59 +0000)]
am
5bbb1af7: Merge "Work on issue #
18486438: Reduce size of bugreport output" into lmp-mr1-dev
* commit '
5bbb1af74a40f60d6609c2b1c580cb91ffb12c54':
Work on issue #
18486438: Reduce size of bugreport output
John Reck [Fri, 14 Nov 2014 00:15:08 +0000 (16:15 -0800)]
Wire up surface width/height to lockHardwareCanvas DO NOT MERGE
Bug:
18338026
Change-Id: I6c37774ef1312278ae81280561060662fef923fb
(cherry picked from commit
b35c9602cf5c628c621e4fe102a461505f302bfe)
Dianne Hackborn [Mon, 24 Nov 2014 17:54:03 +0000 (17:54 +0000)]
Merge "Final resource IDs." into lmp-mr1-dev
Dianne Hackborn [Mon, 24 Nov 2014 17:53:48 +0000 (17:53 +0000)]
Merge "Work on issue #
18486438: Reduce size of bugreport output" into lmp-mr1-dev
Jeff Brown [Mon, 24 Nov 2014 17:40:02 +0000 (17:40 +0000)]
am
b5686d55: am
3d110b23: Make WallpaperService watch the actual display state.
* commit '
b5686d55963e76c801ca0581a1012c5f4aa8d009':
Make WallpaperService watch the actual display state.
Jeff Brown [Mon, 24 Nov 2014 17:34:32 +0000 (17:34 +0000)]
am
3d110b23: Make WallpaperService watch the actual display state.
* commit '
3d110b239153a6c7423a99f02ef859201205eee2':
Make WallpaperService watch the actual display state.
Sreeram Ramachandran [Mon, 24 Nov 2014 17:28:14 +0000 (17:28 +0000)]
am
6d0e8711: Merge "Delete unused/non-working code." into lmp-mr1-dev
* commit '
6d0e8711d0612cfc9d9db2def57541076c0f7a40':
Delete unused/non-working code.
Sreeram Ramachandran [Mon, 24 Nov 2014 17:28:09 +0000 (17:28 +0000)]
am
45e27327: Merge "Allow VPNs to specify their underlying networks." into lmp-mr1-dev
* commit '
45e27327178be9d5524cfcbdde9bb83502668e46':
Allow VPNs to specify their underlying networks.
John Spurlock [Mon, 24 Nov 2014 17:25:32 +0000 (12:25 -0500)]
QS: Update data usage over limit title.
Bug:
18499916
Change-Id: I468eb40cbbbef52853c52e196e458d72f103765a
smain@google.com [Mon, 24 Nov 2014 17:25:00 +0000 (09:25 -0800)]
add intro videos (w/ shadowbox) to Auto and Wear landing pages.
Change-Id: Ieb730416b7a469c7cbd0e80d1e9f74f14a7adb70
Sreeram Ramachandran [Mon, 24 Nov 2014 17:24:25 +0000 (17:24 +0000)]
Merge "Delete unused/non-working code." into lmp-mr1-dev
Sreeram Ramachandran [Mon, 24 Nov 2014 17:24:03 +0000 (17:24 +0000)]
Merge "Allow VPNs to specify their underlying networks." into lmp-mr1-dev
Sreeram Ramachandran [Mon, 24 Nov 2014 17:23:52 +0000 (17:23 +0000)]
am
aaea7e81: Merge "Eliminate race conditions in UID-based network filtering." into lmp-mr1-dev
* commit '
aaea7e81141f4feb6cf5804b815567247b9c1f3a':
Eliminate race conditions in UID-based network filtering.
Sreeram Ramachandran [Mon, 24 Nov 2014 17:21:15 +0000 (17:21 +0000)]
Merge "Eliminate race conditions in UID-based network filtering." into lmp-mr1-dev
Geoff Mendal [Mon, 24 Nov 2014 16:56:47 +0000 (16:56 +0000)]
Merge "Import translations. DO NOT MERGE" into lmp-mr1-ub-dev
Geoff Mendal [Mon, 24 Nov 2014 16:51:30 +0000 (08:51 -0800)]
Import translations. DO NOT MERGE
Change-Id: Ia6e19184b9f8f2ef31f1ea94263fe1090333837e
Auto-generated-cl: translation import
Geoff Mendal [Mon, 24 Nov 2014 16:42:25 +0000 (08:42 -0800)]
Import translations. DO NOT MERGE
Change-Id: I0faffa6e483c6dd763c39006825281b188b53443
Auto-generated-cl: translation import
Narayan Kamath [Mon, 24 Nov 2014 16:32:06 +0000 (16:32 +0000)]
resolved conflicts for merge of
98b8fe74 to lmp-mr1-dev-plus-aosp
Change-Id: Ic2826f3be8337e72a80978e4565e0884b9ceed70
Jorim Jaggi [Mon, 24 Nov 2014 16:30:13 +0000 (16:30 +0000)]
am
f510a8a6: Merge "Tint SIM images in PIN/PUK screen" into lmp-mr1-dev
* commit '
f510a8a688acf08378419aae20d2be25b88a4397':
Tint SIM images in PIN/PUK screen