OSDN Git Service
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: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.
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
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
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
Jorim Jaggi [Mon, 24 Nov 2014 16:26:01 +0000 (16:26 +0000)]
Merge "Tint SIM images in PIN/PUK screen" into lmp-mr1-dev
Adrian Roos [Mon, 24 Nov 2014 16:08:41 +0000 (16:08 +0000)]
am
8a924242: Merge "Revert "Only keep user switcher bitmaps if needed"" into lmp-mr1-dev
* commit '
8a9242428b9d631ba841c166d062f158fd64f0f6':
Revert "Only keep user switcher bitmaps if needed"
Adrian Roos [Mon, 24 Nov 2014 16:08:36 +0000 (16:08 +0000)]
am
07361c84: Merge "Follow up to I96c68af9ccc9940acf9fab3b5bd39a3485f01045" into lmp-mr1-dev
* commit '
07361c8488aa600573c21e27f728c22d44760ecf':
Follow up to I96c68af9ccc9940acf9fab3b5bd39a3485f01045
Adrian Roos [Mon, 24 Nov 2014 16:04:13 +0000 (16:04 +0000)]
am
702d9e31: Merge "Fix DPM.resetPassword("")" into lmp-mr1-dev
* commit '
702d9e31b1bcacff975a2b8e0d04160bbd6811ed':
Fix DPM.resetPassword("")
Christoph Studer [Mon, 24 Nov 2014 16:04:08 +0000 (16:04 +0000)]
am
67142495: Merge "Fix MediaStyle API comments" into lmp-mr1-dev
* commit '
671424951dcd2a0d1059c6d899a8649cbc8b5e26':
Fix MediaStyle API comments
Chris Wren [Mon, 24 Nov 2014 16:04:00 +0000 (16:04 +0000)]
am
1aa63f0b: Merge "Push back notification means snooze the package." into lmp-mr1-dev
* commit '
1aa63f0baf0df58ae22ecb2558a5de7cebd38654':
Push back notification means snooze the package.
Adrian Roos [Mon, 24 Nov 2014 16:03:54 +0000 (16:03 +0000)]
Merge "Revert "Only keep user switcher bitmaps if needed"" into lmp-mr1-dev
Adrian Roos [Mon, 24 Nov 2014 16:03:41 +0000 (16:03 +0000)]
Merge "Follow up to I96c68af9ccc9940acf9fab3b5bd39a3485f01045" into lmp-mr1-dev
Adrian Roos [Mon, 24 Nov 2014 16:02:09 +0000 (16:02 +0000)]
Merge "Fix DPM.resetPassword("")" into lmp-mr1-dev
Christoph Studer [Mon, 24 Nov 2014 16:00:35 +0000 (16:00 +0000)]
Merge "Fix MediaStyle API comments" into lmp-mr1-dev
Chris Wren [Mon, 24 Nov 2014 15:58:14 +0000 (15:58 +0000)]
Merge "Push back notification means snooze the package." into lmp-mr1-dev
Chris Wren [Fri, 21 Nov 2014 21:25:19 +0000 (16:25 -0500)]
LED should not be blocked by interruption filtering.
Bug:
17204854
Change-Id: Ife30c2ebbcf3fce87ac262dbd339b694d4a57728
Geoff Mendal [Mon, 24 Nov 2014 15:35:12 +0000 (15:35 +0000)]
am
ae71b002: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-mr1-dev
* commit '
ae71b0027f5de71a947bc988ebd1c409e73063e0':
Import translations. DO NOT MERGE
Geoff Mendal [Mon, 24 Nov 2014 15:33:35 +0000 (15:33 +0000)]
Merge "Import translations. DO NOT MERGE" into lmp-mr1-ub-dev
Geoff Mendal [Mon, 24 Nov 2014 15:30:47 +0000 (15:30 +0000)]
Merge "Import translations. DO NOT MERGE" into lmp-mr1-dev
Geoff Mendal [Mon, 24 Nov 2014 15:27:02 +0000 (15:27 +0000)]
am
9be80ee5: (-s ours) Import translations. DO NOT MERGE
* commit '
9be80ee53ff5a3df51537f10b3d63f1f7f0ccd3e':
Import translations. DO NOT MERGE
Geoff Mendal [Mon, 24 Nov 2014 15:13:23 +0000 (07:13 -0800)]
Import translations. DO NOT MERGE
Change-Id: I0cddd5a38892d51d9ceb338f039e360dddc877bf
Auto-generated-cl: translation import
Geoff Mendal [Mon, 24 Nov 2014 14:25:15 +0000 (06:25 -0800)]
Import translations. DO NOT MERGE
Change-Id: Ib6f35d7fd27aa2503ee0e1038e1048c989bf31af
Auto-generated-cl: translation import
Geoff Mendal [Mon, 24 Nov 2014 14:21:48 +0000 (06:21 -0800)]
Import translations. DO NOT MERGE
Change-Id: Ib51df7dd1177be11dbe75dc983866a9cfdf74511
Auto-generated-cl: translation import
Christoph Studer [Mon, 24 Nov 2014 13:18:06 +0000 (14:18 +0100)]
Fix MediaStyle API comments
Bug:
17805819
Change-Id: Ie45a43d7ae99304d635ce75aeb32a6d4d4e3e57d
Zoltan Szatmary-Ban [Mon, 24 Nov 2014 12:13:15 +0000 (12:13 +0000)]
am
604aec95: Merge "Add new subcommand \'set-active-admin\' to the dpm command." into lmp-mr1-dev
* commit '
604aec9574212aabb3391585799a72e6820466cd':
Add new subcommand 'set-active-admin' to the dpm command.
Zoltan Szatmary-Ban [Mon, 24 Nov 2014 12:08:17 +0000 (12:08 +0000)]
Merge "Add new subcommand 'set-active-admin' to the dpm command." into lmp-mr1-dev
Selim Cinek [Mon, 24 Nov 2014 11:57:59 +0000 (11:57 +0000)]
am
962b06f9: Merge "Fixed several time related states for secondary users" into lmp-mr1-dev
* commit '
962b06f9a02f08392b6f87225a314ebf39dd7a07':
Fixed several time related states for secondary users
Selim Cinek [Mon, 24 Nov 2014 11:52:36 +0000 (11:52 +0000)]
Merge "Fixed several time related states for secondary users" into lmp-mr1-dev
a20023 [Wed, 12 Nov 2014 20:59:39 +0000 (14:59 -0600)]
Set network selection to automatic when in Global mode
Verzion requests that network selection should be set to automatic when
network mode is global.
Bug:
18372726
Change-Id: I58aae223e15351efc3f58a938630f0aa9600537e
Wink Saville [Sat, 22 Nov 2014 20:28:10 +0000 (20:28 +0000)]
am
12c2136e: Merge "Additional changes to SubscriptionManager API as per API council." into lmp-mr1-dev
* commit '
12c2136e556b54a717624d8479ec4650f363ce45':
Additional changes to SubscriptionManager API as per API council.
Wink Saville [Sat, 22 Nov 2014 20:19:23 +0000 (20:19 +0000)]
Merge "Additional changes to SubscriptionManager API as per API council." into lmp-mr1-dev
Wink Saville [Sat, 22 Nov 2014 18:08:16 +0000 (10:08 -0800)]
Additional changes to SubscriptionManager API as per API council.
bug:
17575308
Change-Id: Idd98aa46c15a9219ccf28091c62602ac8bf16c62
Svet Ganov [Thu, 20 Nov 2014 15:43:30 +0000 (07:43 -0800)]
Print spooler crash when printing after a rotation.
1. Available printers are provided by a loader driven by the activity
lifecycle. After a rotation of an app that does not handle rotation
the print activity is destroyed in a delayed fashion. When another
print task is started the loader of the destroed activity gets two
cancellations, one when the activity is stopped and one when it is
destroyed but when the second cancellation happens the loader has a
bad state that it is loading while it is not and a NPE occurs.
2. If a rotation happens early before the print activity is fully initialized
(there are asyncrconous operations that take place) we get a NPE as
the print preview controller is not created yet.
3. A lockup of the print preview process occurs if the print print
activity is destroyed after we initiated binding to the rendering
service but before we receive the remote interface. In this case no
remote service is received as exepcted since we already unbound from
it resulting in a missed signal.
bug:
18238590
Change-Id: I81817d81702f649ded97dfbab7d7bba28f22fa91
Lajos Molnar [Sat, 22 Nov 2014 06:02:51 +0000 (06:02 +0000)]
am
c398f175: Merge "media: fix isSupportedFormat for integer frame rate" into lmp-mr1-dev
* commit '
c398f175cdc2ceb31bc45b6541f7cd9c3c52406a':
media: fix isSupportedFormat for integer frame rate
Lajos Molnar [Sat, 22 Nov 2014 05:59:29 +0000 (05:59 +0000)]
Merge "media: fix isSupportedFormat for integer frame rate" into lmp-mr1-dev
Eino-Ville Talvala [Sat, 22 Nov 2014 05:00:48 +0000 (05:00 +0000)]
am
dfa99f63: Merge "Camera: Add new capability flags as system features as well" into lmp-mr1-dev
* commit '
dfa99f63677c238453293f48b62b4fffcc101262':
Camera: Add new capability flags as system features as well
Eino-Ville Talvala [Sat, 22 Nov 2014 04:57:47 +0000 (04:57 +0000)]
Merge "Camera: Add new capability flags as system features as well" into lmp-mr1-dev
Jeff Brown [Sat, 22 Nov 2014 03:01:13 +0000 (19:01 -0800)]
Make WallpaperService watch the actual display state.
Bug:
18471411
Change-Id: Ie9d2e70e4e105dfbb2cb4d9726f632bcf2cc0a31
RoboErik [Sat, 22 Nov 2014 02:43:31 +0000 (02:43 +0000)]
am
a08adb24: Fix binder equality check
* commit '
a08adb2437f641087e01436293736be235fe1fda':
Fix binder equality check
RoboErik [Sat, 22 Nov 2014 02:28:18 +0000 (18:28 -0800)]
Fix binder equality check
Forgot to call .asBinder() before checking binders for equality. This
fixes a memory leak caused by the system holding on to binders.
bug:
18049316
Change-Id: I43a9f4163b28cf1a77e59c3e7bade32bd2ef1c1a
Dianne Hackborn [Sat, 22 Nov 2014 01:04:53 +0000 (17:04 -0800)]
Final resource IDs.
Change-Id: Ie4b811f2a914191dded8de1b3d6321cff4db882c
Joe Fernandez [Sat, 22 Nov 2014 00:30:37 +0000 (00:30 +0000)]
am
85f463c5: am
fbdfdef4: am
9034ead0: am
5b94d00b: docs: URGENT Removing Chinese Lollipop translations, fixing zh-cn resources
* commit '
85f463c5b59350fa4c4a05007f8a7b65a9a89da3':
docs: URGENT Removing Chinese Lollipop translations, fixing zh-cn resources
Scott Rowe [Sat, 22 Nov 2014 00:30:32 +0000 (00:30 +0000)]
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 '
a505d0becb5f2d4fafca543eaa7a390605951974':
docs: b/
17996176 [DAC-review-bug] Update Hardware Accelerated Table to API 21 Change-Id: I3bb972cc1defd3e6fa6295664e41311b85698f31
Joe Fernandez [Sat, 22 Nov 2014 00:25:13 +0000 (00:25 +0000)]
am
fbdfdef4: am
9034ead0: am
5b94d00b: docs: URGENT Removing Chinese Lollipop translations, fixing zh-cn resources
* commit '
fbdfdef43da5d946e8559d47d8bd79db0bceedb1':
docs: URGENT Removing Chinese Lollipop translations, fixing zh-cn resources
Scott Rowe [Sat, 22 Nov 2014 00:24:51 +0000 (00:24 +0000)]
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 '
63108ee3623cc2b57c3a0a2e730dc9bf5c06c825':
docs: b/
17996176 [DAC-review-bug] Update Hardware Accelerated Table to API 21 Change-Id: I3bb972cc1defd3e6fa6295664e41311b85698f31
Sanket Padawe [Fri, 21 Nov 2014 23:37:57 +0000 (23:37 +0000)]
am
ab4a940a: Merge "Make default carrier name string look better." into lmp-mr1-dev
* commit '
ab4a940a8ae4a5fb63a84fa51527b7703e7bfc88':
Make default carrier name string look better.
John Reck [Fri, 21 Nov 2014 23:37:52 +0000 (23:37 +0000)]
am
418c8549: Merge "It\'s super critical to call nStart" into lmp-mr1-dev
* commit '
418c8549dca8bff8c38c67ed7f7d7fbbaccd4e71':
It's super critical to call nStart
Sanket Padawe [Fri, 21 Nov 2014 23:33:24 +0000 (23:33 +0000)]
Merge "Make default carrier name string look better." into lmp-mr1-dev
John Reck [Fri, 21 Nov 2014 23:32:05 +0000 (23:32 +0000)]
Merge "It's super critical to call nStart" into lmp-mr1-dev
Dianne Hackborn [Fri, 21 Nov 2014 23:23:13 +0000 (15:23 -0800)]
Work on issue #
18486438: Reduce size of bugreport output
Reduce how much stuff ProcessStats spews, and do collapsing of
repeated intent filter targets when dumping IntentResolvers.
Also add to pm's checkout output to include shared user ids,
and fix output formatting in a few places.
Change-Id: Ic9fc6731f0439101ba9343535e66cdbbad47e291
Winson Chung [Fri, 21 Nov 2014 23:19:38 +0000 (23:19 +0000)]
am
71113e43: Merge "Reset the task stack instead of the view when Recents is hidden. (Bug.
18436876, Bug.
18394126, Bug.
18432310)" into lmp-mr1-dev
* commit '
71113e43e768d973b3721f8fac9f9654ed159911':
Reset the task stack instead of the view when Recents is hidden. (Bug.
18436876, Bug.
18394126, Bug.
18432310)
Jeff Sharkey [Fri, 21 Nov 2014 23:19:30 +0000 (23:19 +0000)]
am
17400627: Merge "Avoid NPE in forceStopPackageLocked()." into lmp-mr1-dev
* commit '
1740062728bf66f416b47b0c7f7d89c8d6b77504':
Avoid NPE in forceStopPackageLocked().
Winson Chung [Fri, 21 Nov 2014 23:15:03 +0000 (23:15 +0000)]
Merge "Reset the task stack instead of the view when Recents is hidden. (Bug.
18436876, Bug.
18394126, Bug.
18432310)" into lmp-mr1-dev
Jeff Sharkey [Fri, 21 Nov 2014 23:14:03 +0000 (23:14 +0000)]
Merge "Avoid NPE in forceStopPackageLocked()." into lmp-mr1-dev