OSDN Git Service
Raph Levien [Thu, 14 Jul 2016 22:25:39 +0000 (22:25 +0000)]
Merge "Treat U+2695, U+2640, U+2642 as emoji characters." into nyc-mr1-dev
Raph Levien [Thu, 14 Jul 2016 22:25:20 +0000 (22:25 +0000)]
Merge "Delete gender-balanced emoji sequence by one backspace key event." into nyc-mr1-dev
Raph Levien [Thu, 14 Jul 2016 22:24:13 +0000 (22:24 +0000)]
Merge "Patch out part of the emoji tests." into nyc-mr1-dev
Victor Chang [Thu, 14 Jul 2016 22:09:59 +0000 (22:09 +0000)]
Merge \"Disallow shell to mutate always-on vpn when DISALLOW_CONFIG_VPN user restriction is set\" into nyc-dev
am:
488042fe3b
Change-Id: I4d542c19e057b044544a2ed4f07b9c2cc5866f0f
Victor Chang [Thu, 14 Jul 2016 22:04:10 +0000 (22:04 +0000)]
Merge "Disallow shell to mutate always-on vpn when DISALLOW_CONFIG_VPN user restriction is set" into nyc-dev
Bill Yi [Thu, 14 Jul 2016 20:47:18 +0000 (20:47 +0000)]
Merge \"Import translations. DO NOT MERGE\" into nyc-dev
am:
9cdfb9d781 -s ours
Change-Id: I861d47e86d5695382ecf2e3093e567f710273c1c
TreeHugger Robot [Thu, 14 Jul 2016 20:39:48 +0000 (20:39 +0000)]
Merge "Import translations. DO NOT MERGE" into nyc-dev
TreeHugger Robot [Thu, 14 Jul 2016 20:27:16 +0000 (20:27 +0000)]
Merge "Import translations. DO NOT MERGE" into nyc-mr1-dev
TreeHugger Robot [Thu, 14 Jul 2016 20:08:58 +0000 (20:08 +0000)]
Merge "Add LTE+ and update 4G+ icons" into nyc-mr1-dev
TreeHugger Robot [Thu, 14 Jul 2016 20:05:37 +0000 (20:05 +0000)]
Merge "Require permission for FLAG_WILL_BE_FOREGROUND." into nyc-mr1-dev
TreeHugger Robot [Thu, 14 Jul 2016 19:55:12 +0000 (19:55 +0000)]
Merge "Allow no longer waiting for visible activity to be stopped." into nyc-mr1-dev
Carlos Valdivia [Thu, 14 Jul 2016 19:11:02 +0000 (19:11 +0000)]
Merge "Only broadcast LOGIN_ACCOUNTS_CHANGED when changes occur." into nyc-mr1-dev
Justin Klaassen [Thu, 14 Jul 2016 18:55:30 +0000 (18:55 +0000)]
Merge "Refactor display color transforms" into nyc-mr1-dev
Sergio Giro [Thu, 14 Jul 2016 18:48:55 +0000 (18:48 +0000)]
Add bound checks to utf16_to_utf8 am:
bce11021b2 am:
008120497b am:
bab3334226 am:
ff58d7c918 -s ours
am:
437776ac65
Change-Id: Ic88ad611257693f8f5691e48493ed0ac46a1a45a
Sergio Giro [Thu, 14 Jul 2016 18:42:45 +0000 (18:42 +0000)]
Add bound checks to utf16_to_utf8 am:
bce11021b2 am:
008120497b am:
bab3334226
am:
ff58d7c918 -s ours
Change-Id: I31000817d4f99c215277d580948a20194176d53e
Justin Klaassen [Tue, 12 Jul 2016 03:52:23 +0000 (20:52 -0700)]
Refactor display color transforms
- Removed Secure.ACCESSIBILITY_DISPLAY_COLOR_MATRIX, it's not desirable
to persist the actual color transformation matrix.
- Refactored all SurfaceFlinger transforms to DisplayTransformManager,
which allows color transforms to be set independently from the a11y
manager service.
Bug:
30042357
Change-Id: Iefa477dedb66aac90e1218e327802a3fab6899ed
Sergio Giro [Thu, 14 Jul 2016 18:23:54 +0000 (18:23 +0000)]
Add bound checks to utf16_to_utf8 am:
bce11021b2 am:
008120497b
am:
bab3334226
Change-Id: I6e4e399dfcf89f46d40a162c77462b889883f569
Felipe Leme [Thu, 14 Jul 2016 18:23:12 +0000 (18:23 +0000)]
Merge \"Fixed statuses on Battery Saver column.\" into nyc-dev
am:
24b2e7bbee
Change-Id: I6b871cebf05f0fe18b054df456aabd80b10336aa
smain@google.com [Thu, 14 Jul 2016 18:23:04 +0000 (18:23 +0000)]
delete old Community page, redirect to Support page
am:
845cf07bdd
Change-Id: Icf5f64df8ec68544b6e4888309444ef39cb8b494
Sergio Giro [Thu, 14 Jul 2016 18:15:33 +0000 (18:15 +0000)]
Add bound checks to utf16_to_utf8 am:
bce11021b2
am:
008120497b
Change-Id: Ib3135f8f186b10b773592d2bcbeae398cfd2fee1
Felipe Leme [Thu, 14 Jul 2016 18:10:55 +0000 (18:10 +0000)]
Merge "Fixed statuses on Battery Saver column." into nyc-dev
Sergio Giro [Thu, 14 Jul 2016 18:07:34 +0000 (18:07 +0000)]
Add bound checks to utf16_to_utf8
am:
1deedbacc3
Change-Id: I5004728668382feeafcc6fa6155b3169d8240664
Sergio Giro [Thu, 14 Jul 2016 18:07:23 +0000 (18:07 +0000)]
Add bound checks to utf16_to_utf8
am:
bce11021b2
Change-Id: Ic4995dee3763290f75b3ef623f257c71748d9d51
smain@google.com [Thu, 14 Jul 2016 18:05:19 +0000 (11:05 -0700)]
delete old Community page, redirect to Support page
Change-Id: I2c570f8bf88392db75aa78c2e702515b262f2830
Felipe Leme [Thu, 14 Jul 2016 18:04:49 +0000 (11:04 -0700)]
Fixed statuses on Battery Saver column.
BUG:
30139400
Change-Id: I1798607af13c9be5e1f21212fd7078f7152562bd
Makoto Onuki [Thu, 14 Jul 2016 17:50:21 +0000 (17:50 +0000)]
Merge "Don't allow shortcuts with non-main activities" into nyc-mr1-dev
Makoto Onuki [Thu, 14 Jul 2016 01:03:13 +0000 (18:03 -0700)]
Don't allow shortcuts with non-main activities
Bug
30122758
Change-Id: Id9ead6706d5460fec3d68c7457e3097f30a9a080
Jeff Sharkey [Thu, 14 Jul 2016 16:31:15 +0000 (10:31 -0600)]
Require permission for FLAG_WILL_BE_FOREGROUND.
We caught scheduleAsPackage(), but not schedule(), oops.
Bug:
28998999
Change-Id: I0642c2265ff61eead8747cc6b4d0f852f1ca3ef2
Philip P. Moltmann [Thu, 14 Jul 2016 16:21:10 +0000 (16:21 +0000)]
Merge "Always trigger a write if no pages are written" into nyc-mr1-dev
Wale Ogunwale [Thu, 14 Jul 2016 16:17:59 +0000 (09:17 -0700)]
Allow no longer waiting for visible activity to be stopped.
When process the stop list we remove an activity that was previously
waiting for visible and is now visible from the list and also hide
its windows if it is finishing. However, we don't transition it to the
stopped state because it was waiting for visible. If it is finishing
and the windows are hidden then it makes sense to transition it into
the stopped state since it will not be visible to the user again.
Bug:
30058392
Change-Id: Iac81e2877716ae58d05aed42e1433190a2f70428
Sergio Giro [Tue, 28 Jun 2016 17:26:10 +0000 (18:26 +0100)]
Add bound checks to utf16_to_utf8
Test: ran libaapt2_tests64
Bug:
29250543
Change-Id: I1ebc017af623b6514cf0c493e8cd8e1d59ea26c3
(cherry picked from commit
4781057e78f63e0e99af109cebf3b6a78f4bfbb6)
Dan Sandler [Sun, 26 Jun 2016 19:59:13 +0000 (15:59 -0400)]
WIP debugging.
Bug:
28524184
Change-Id: I0126b1db0c2346ca8d7511b80464c0239f06eeba
Geoffrey Pitsch [Thu, 14 Jul 2016 14:14:57 +0000 (14:14 +0000)]
Merge "Fixes delay when playing first sound in BootAnimation" into nyc-mr1-dev
Bill Yi [Thu, 14 Jul 2016 13:48:37 +0000 (06:48 -0700)]
Import translations. DO NOT MERGE
Change-Id: Ie48e587beb52623dec3ccefc85daa7b0f53ec037
Auto-generated-cl: translation import
Bill Yi [Thu, 14 Jul 2016 13:33:13 +0000 (06:33 -0700)]
Import translations. DO NOT MERGE
Change-Id: I00c813fd0ad16c98cc15eec52a9af333528babfa
Auto-generated-cl: translation import
Sergio Giro [Tue, 28 Jun 2016 17:26:10 +0000 (18:26 +0100)]
Add bound checks to utf16_to_utf8
Test: ran libaapt2_tests64
Bug:
29250543
Change-Id: I1ebc017af623b6514cf0c493e8cd8e1d59ea26c3
(cherry picked from commit
4781057e78f63e0e99af109cebf3b6a78f4bfbb6)
Jason Monk [Wed, 13 Jul 2016 18:22:52 +0000 (14:22 -0400)]
Add LTE+ and update 4G+ icons
Change-Id: Ic91450207921afbfab24cc02d00639d532495c58
Fixes:
30006697
Jason Monk [Thu, 14 Jul 2016 13:08:45 +0000 (13:08 +0000)]
Merge "QS Detail: Remove up arrow" into nyc-mr1-dev
Victor Chang [Tue, 12 Jul 2016 22:47:29 +0000 (23:47 +0100)]
Disallow shell to mutate always-on vpn when DISALLOW_CONFIG_VPN user restriction is set
Fix:
29899712
Change-Id: I38cc9d0e584c3f2674c9ff1d91f77a11479d8943
(cherry picked from commit
9c7b706cf4332b4aeea39c166abca04b56685280)
Rubin Xu [Thu, 14 Jul 2016 09:46:21 +0000 (09:46 +0000)]
Merge "Fix typo in DevicePolicyManager" into nyc-mr1-dev
Chris Banes [Thu, 14 Jul 2016 09:11:03 +0000 (09:11 +0000)]
Merge "Read translation and elevation attributes as floats" into nyc-mr1-dev
Nicolas Geoffray [Thu, 14 Jul 2016 08:32:51 +0000 (08:32 +0000)]
Merge changes I7a052a8e,Idb11b1c0 into nyc-mr1-dev
* changes:
[RFC] Special case system apps for profile optimizations
Compile core-apps according to their own "reason" for A/B
Calin Juravle [Tue, 12 Jul 2016 14:56:41 +0000 (15:56 +0100)]
[RFC] Special case system apps for profile optimizations
If the OTA updates a system app which was previously preopted to a non-
preopted state the app might end up being verified at runtime. That's
because by default the apps are verify-profile but for preopted apps
there's no profile.
Do a hacky check to ensure that if we have no profiles (a reasonable
indication that before the OTA the app was preopted) system apps get
compiled with a non-profile filter (by default interpret-only).
Bug:
30032273
Test: Andreas "has verified that Calin's change to A/B works as expected
and promotes things like SystemUI to speed. From my side, that's
ready to be merged"
Change-Id: I7a052a8ea76cab7f649dc993237ea05534d6c4b9
Philip P. Moltmann [Thu, 14 Jul 2016 00:05:03 +0000 (17:05 -0700)]
Always trigger a write if no pages are written
If a previous write was canceled we can end up in the situation where
the layout reports "not changes since layout" but no pages have been
written.
In this case we have to trigger a write even if the layout reports that
nothing changed.
Fixes:
24110832
Change-Id: I4b3f69581e63f4084cd3712861288ded7d9c9249
TreeHugger Robot [Thu, 14 Jul 2016 05:04:38 +0000 (05:04 +0000)]
Merge "Make Night display off by default" into nyc-mr1-dev
Jack Yu [Thu, 14 Jul 2016 04:58:53 +0000 (04:58 +0000)]
Merge "Disable VT when users turn off data or hit data limit" into nyc-mr1-dev
Michael Kwan [Thu, 14 Jul 2016 03:32:26 +0000 (03:32 +0000)]
Merge "Update theme colours for watch type devices." into nyc-mr1-dev
TreeHugger Robot [Thu, 14 Jul 2016 03:17:04 +0000 (03:17 +0000)]
Merge "More correctly track upstream network properties." into nyc-mr1-dev
Tomasz Mikolajewski [Thu, 14 Jul 2016 03:16:40 +0000 (03:16 +0000)]
Merge "Fix javadoc broken links in DocumentsContract." into nyc-mr1-dev
Justin Klaassen [Wed, 13 Jul 2016 23:34:28 +0000 (16:34 -0700)]
Make Night display off by default
Bug:
30042357
Change-Id: Id7528ee56e162e3e2865a61273e8380ce299c0d7
TreeHugger Robot [Thu, 14 Jul 2016 02:09:04 +0000 (02:09 +0000)]
Merge "Fix ShadowGrid in UiBench" into nyc-mr1-dev
Andrew Solovay [Thu, 14 Jul 2016 02:05:50 +0000 (02:05 +0000)]
Merge \"docs: Added link to API diff between M and N\" into nyc-dev
am:
17b221792a
Change-Id: I96dbdbdf051b891c91421eb0bfe2080a06a006cd
TreeHugger Robot [Thu, 14 Jul 2016 01:57:09 +0000 (01:57 +0000)]
Merge "Add Night display QSTile" into nyc-mr1-dev
Andrew Solovay [Thu, 14 Jul 2016 01:52:18 +0000 (01:52 +0000)]
Merge "docs: Added link to API diff between M and N" into nyc-dev
Adam Lesinski [Thu, 14 Jul 2016 01:50:52 +0000 (01:50 +0000)]
Merge \"Don\'t hold on to AssetManager instances\" into nyc-dev
am:
f8e99e72e7
Change-Id: I71b7499c6399ecbf1d8e8d93bf410aabbb2a1044
Adam Lesinski [Thu, 14 Jul 2016 01:40:34 +0000 (01:40 +0000)]
Merge "Don't hold on to AssetManager instances" into nyc-dev
TreeHugger Robot [Thu, 14 Jul 2016 01:38:52 +0000 (01:38 +0000)]
Merge changes I56d6be69,Ibf8f9b26 into nyc-mr1-dev
* changes:
Fixed a bug where the headsup would be stuck disappearing
Changed the appearance of phone call notifications
Phil Weaver [Thu, 14 Jul 2016 01:25:04 +0000 (01:25 +0000)]
Merge "Behave if the same view gets a11y focus twice." into nyc-mr1-dev
TreeHugger Robot [Thu, 14 Jul 2016 01:16:37 +0000 (01:16 +0000)]
Merge "Preemptively add string for possible toast." into nyc-mr1-dev
Wei Jia [Thu, 14 Jul 2016 01:14:40 +0000 (01:14 +0000)]
Merge \"MediaDataSource: add DrmInitialization for IDataSource.\" into nyc-dev
am:
9604b3803c
Change-Id: I080b409a7f73cfadd5103efbbe563184d57f63d7
TreeHugger Robot [Thu, 14 Jul 2016 01:07:13 +0000 (01:07 +0000)]
Merge "MediaDataSource: add DrmInitialization for IDataSource." into nyc-dev
Michael Kwan [Thu, 14 Jul 2016 00:41:29 +0000 (17:41 -0700)]
Update theme colours for watch type devices.
Bug:
26914376
Change-Id: I127a9404fa8dea2db6c3196742566f8d12ccb113
Adam Lesinski [Wed, 13 Jul 2016 19:09:24 +0000 (12:09 -0700)]
Don't hold on to AssetManager instances
If we enter multi-window mode or load WebView
assets into a Resources object, then the underlying
AssetManager instance may change.
crbug.com/627586
Bug:
30118654
Change-Id: I837637bdad5370809db7f060d7d8536b536cad9e
TreeHugger Robot [Thu, 14 Jul 2016 00:13:46 +0000 (00:13 +0000)]
Merge "Give the default storage manager access to the storage permissions." into nyc-mr1-dev
Tim Murray [Thu, 14 Jul 2016 00:07:51 +0000 (00:07 +0000)]
Merge \"Don\'t dump stack traces for background ANRs.\" into nyc-dev
am:
b2b203ae13
Change-Id: I0777b4d28be2601425b6fe7f51f3ec7dc5635c6e
Tim Murray [Thu, 14 Jul 2016 00:00:29 +0000 (00:00 +0000)]
Merge "Don't dump stack traces for background ANRs." into nyc-dev
Andrew Sapperstein [Thu, 14 Jul 2016 00:00:25 +0000 (00:00 +0000)]
Merge "Use colorControlHighlight for print button ripple." into nyc-mr1-dev
Wei Liu [Wed, 13 Jul 2016 23:59:27 +0000 (23:59 +0000)]
Merge "Add BUGREPORT_OPTION_WEAR so that Wear can customize its bugreporting." into nyc-mr1-dev
TreeHugger Robot [Wed, 13 Jul 2016 23:45:38 +0000 (23:45 +0000)]
Merge "Disallow safe boot when in demo mode" into nyc-mr1-dev
Annie Chin [Wed, 13 Jul 2016 23:42:03 +0000 (23:42 +0000)]
Merge "Set mContext scope to protected." into nyc-mr1-dev
Annie Chin [Fri, 8 Jul 2016 21:52:00 +0000 (14:52 -0700)]
Set mContext scope to protected.
Bug:
29582254
Change-Id: I5c9861373b712a4bd9e5f1fba1e638d1ff6be170
Doris Liu [Wed, 13 Jul 2016 23:38:10 +0000 (23:38 +0000)]
Merge "Fix use-after-free in vector drawable animation" into nyc-mr1-dev
Annie Chin [Wed, 13 Jul 2016 23:35:08 +0000 (23:35 +0000)]
Merge "Add setLandscape() method to ButtonInterface" into nyc-mr1-dev
Jack Yu [Fri, 8 Jul 2016 21:28:51 +0000 (14:28 -0700)]
Disable VT when users turn off data or hit data limit
Disable VT when users turn off data or hit data limit. If
there are ongoing VT calls, we'll need to downgrade them
to VoLTE calls.
bug:
27316521
Change-Id: I89fe42f6cf6c419c21c4f2006e9cb43cf7e13503
Wei Jia [Thu, 7 Jul 2016 23:08:30 +0000 (16:08 -0700)]
MediaDataSource: add DrmInitialization for IDataSource.
Bug:
29342399
Bug:
28901867
Change-Id: Ib2049566582aa08783ff588dd25afef4e1c0b5e2
(cherry picked from commit
a03dc2b5eb94a906eeeda5bf0afbcfb60588abb4)
Android Build Merger (Role) [Wed, 13 Jul 2016 23:06:25 +0000 (23:06 +0000)]
Merge "Merge \"Doc: Minor fixes following launch of Performance section on DAC.\" into nyc-dev am:
419dbdb538" into nyc-mr1-dev
Android Build Merger (Role) [Wed, 13 Jul 2016 23:06:16 +0000 (23:06 +0000)]
Merge "Merge \"Avoid throwing when 0 size layer requested\" into nyc-dev am:
807989facd" into nyc-mr1-dev
David Friedman [Wed, 13 Jul 2016 23:05:56 +0000 (23:05 +0000)]
Merge \"Doc: Minor fixes following launch of Performance section on DAC.\" into nyc-dev
am:
419dbdb538
Change-Id: I2540f9ddfe0bd3e8fb1e18ad019276369d76f83b
Chris Craik [Wed, 13 Jul 2016 23:05:53 +0000 (23:05 +0000)]
Merge \"Avoid throwing when 0 size layer requested\" into nyc-dev
am:
807989facd
Change-Id: Ie5ed67db841478cb6bbc6b90f768521d049833e6
Ashutosh Joshi [Wed, 13 Jul 2016 23:04:46 +0000 (23:04 +0000)]
Merge "Add state for loading/unloading apps" into nyc-mr1-dev
Tim Murray [Wed, 13 Jul 2016 20:33:28 +0000 (13:33 -0700)]
Don't dump stack traces for background ANRs.
Dumping stack traces can be extremely expensive, and doing so for
background applications often has extremely negative side effects for
foreground applications. This can be exacerbated by resource-intensive
applications, because those may exhibit thermal throttling in the first
place. For such applications, the additional performance hit caused by
stack dumps may be catastrophic.
Instead, don't dump stack traces for background ANRs except for the app
that actually ANR'd.
bug
30112521
Change-Id: I8a05059343254861c436a193690cd1c50a95d674
Joe Fernandez [Wed, 13 Jul 2016 23:00:26 +0000 (23:00 +0000)]
Merge "Doc: Minor fixes following launch of Performance section on DAC." into nyc-dev
Chris Craik [Fri, 1 Jul 2016 17:25:46 +0000 (10:25 -0700)]
Fix ShadowGrid in UiBench
fixes:
30013642
Refactor Fragment to not be anonymous, support lib hates those.
Change-Id: Ia0e282b4b5ff7abf1a50b42ad2497d3c3344ccbc
(cherry picked from commit
9f0fa995c57cedf4e4a707955e55e17ea9116ffe)
Winson Chung [Wed, 13 Jul 2016 22:56:50 +0000 (22:56 +0000)]
Merge "Ensure we pass correct values into the next transition start bounds." into nyc-mr1-dev
TreeHugger Robot [Wed, 13 Jul 2016 22:55:35 +0000 (22:55 +0000)]
Merge "Remove subtle dependencies" into nyc-mr1-dev
Chris Craik [Wed, 13 Jul 2016 22:49:19 +0000 (22:49 +0000)]
Merge "Avoid throwing when 0 size layer requested" into nyc-dev
Justin Klaassen [Wed, 22 Jun 2016 03:28:12 +0000 (20:28 -0700)]
Add Night display QSTile
Bug:
28615069
Bug:
29619615
Change-Id: Ie23bd1ed9266941682eceb5f2086201bf02af765
Android Build Merger (Role) [Wed, 13 Jul 2016 22:40:08 +0000 (22:40 +0000)]
Merge "Merge \"docs: added placeholder redirect for New Class dialog AS 2.2 b/
30045484\" into nyc-dev am:
e820803172" into nyc-mr1-dev
Cheryl Potter [Wed, 13 Jul 2016 22:39:46 +0000 (22:39 +0000)]
Merge \"docs: added placeholder redirect for New Class dialog AS 2.2 b/
30045484\" into nyc-dev
am:
e820803172
Change-Id: I2f0c8e31b9a4e2427166e170f55c2e1c8729cd82
TreeHugger Robot [Wed, 13 Jul 2016 22:39:34 +0000 (22:39 +0000)]
Merge "Fix QS gear metrics" into nyc-mr1-dev
Jeff Sharkey [Wed, 13 Jul 2016 22:32:25 +0000 (16:32 -0600)]
Preemptively add string for possible toast.
Bug:
30033319
Change-Id: I4daf4d35656514a835bed1b255dd48f3a0eeb845
TreeHugger Robot [Wed, 13 Jul 2016 22:37:30 +0000 (22:37 +0000)]
Merge "Make Recents button work in demo mode" into nyc-mr1-dev
Ashutosh Joshi [Wed, 27 Apr 2016 18:19:16 +0000 (11:19 -0700)]
Add state for loading/unloading apps
Add state for loading/unloading nanoApps.
Pass on OS response to ContextHubService clients.
Fix Build Breakage due to uninitalized variables.
Bug:
29193948
Change-Id: Ibebecf704bb3ad2583e110f1fcf05400a53b1b4c
Ashutosh Joshi [Wed, 13 Jul 2016 22:17:36 +0000 (22:17 +0000)]
Merge "Revert "Add state for loading/unloading apps"" into nyc-mr1-dev
Andrew Solovay [Wed, 13 Jul 2016 22:17:10 +0000 (15:17 -0700)]
docs: Added link to API diff between M and N
Removed links to download the reference docs bundle, now that the
API docs and the diff are available online.
See first comment for doc stage location.
bug:
29245751
Change-Id: I65f8661463cb03b6651391771abd2597d6e59a44
Ashutosh Joshi [Wed, 13 Jul 2016 22:15:19 +0000 (22:15 +0000)]
Revert "Add state for loading/unloading apps"
This reverts commit
00b351aeef9c660cf3b1cfb3b24aae82d3fe2b8e.
Change-Id: Iee229adff8fec4f2407aa895886e63953f0d7d32
Cheryl Potter [Wed, 13 Jul 2016 22:13:49 +0000 (22:13 +0000)]
Merge "docs: added placeholder redirect for New Class dialog AS 2.2 b/
30045484" into nyc-dev
Wei Jia [Wed, 13 Jul 2016 22:04:58 +0000 (22:04 +0000)]
Merge "MediaPlayer: fix typo for OnInfoListener." into nyc-mr1-dev
TreeHugger Robot [Wed, 13 Jul 2016 22:00:37 +0000 (22:00 +0000)]
Merge "Fix disabling lockscreen for demo users." into nyc-mr1-dev
Selim Cinek [Wed, 13 Jul 2016 21:34:56 +0000 (14:34 -0700)]
Fixed a bug where the headsup would be stuck disappearing
Change-Id: I56d6be69f6e59c1bec647e7e70e50a36b793f895
Fixes:
30120962