OSDN Git Service
Michael Wachenschwanz [Fri, 12 May 2017 21:06:11 +0000 (21:06 +0000)]
Merge "Fix JobSet getJobsByUser" into oc-dev am:
b6d30e1404
am:
9c9f4e72a2
Change-Id: Ic6290a0468ae02697fbb2a21617596c7d6af604f
Ying Xu [Fri, 12 May 2017 20:56:23 +0000 (20:56 +0000)]
Merge "Add the new RIL requests and NetworkScanResult."
Michael Wachenschwanz [Fri, 12 May 2017 20:56:07 +0000 (20:56 +0000)]
Merge "Fix JobSet getJobsByUser" into oc-dev
am:
b6d30e1404
Change-Id: I40b8919a21da6592e6ad561da2dad7878448ad2e
Youngsang Cho [Fri, 12 May 2017 20:49:39 +0000 (20:49 +0000)]
Merge "Set notification TAG and style in TV PIP notification" into oc-dev am:
c82737b98f
am:
f97c2ffbaf
Change-Id: Iff16150c699a7fb0c413a54f0d3c3f78e0cc0253
Michael Wachenschwanz [Fri, 12 May 2017 20:47:46 +0000 (20:47 +0000)]
Merge "Fix JobSet getJobsByUser" into oc-dev
Eugene Susla [Fri, 12 May 2017 20:47:10 +0000 (20:47 +0000)]
Merge "Avoid activity leak via Companion callback" into oc-dev am:
6c97781468
am:
445728052b
Change-Id: Ie03f215253d00bc47f268f3574063d8c8c2841ac
Felipe Leme [Fri, 12 May 2017 20:41:35 +0000 (20:41 +0000)]
Merge "Removed deprecated APIs." into oc-dev am:
4b91fe8699
am:
3eee11cb4d
Change-Id: I39859572bfd0b8e34d02ad96147364e0f4ce2ee5
Android Build Merger (Role) [Fri, 12 May 2017 20:35:26 +0000 (20:35 +0000)]
Merge "Merge "Update Bitmap#prepareToDraw doc" into oc-dev am:
d4fff1565b am:
27caadd2c4"
Chris Craik [Fri, 12 May 2017 20:34:36 +0000 (20:34 +0000)]
Merge "Update Bitmap#prepareToDraw doc" into oc-dev am:
d4fff1565b
am:
27caadd2c4
Change-Id: I403d0a52958c7bf2720f078f5db140e3a3c3ebe7
Android Build Merger (Role) [Fri, 12 May 2017 20:34:10 +0000 (20:34 +0000)]
Merge "Merge "Do not hold WM lock while closing animation transaction" into oc-dev am:
ab7eb6de4d am:
dcf479e5c0"
Jorim Jaggi [Fri, 12 May 2017 20:33:11 +0000 (20:33 +0000)]
Merge "Do not hold WM lock while closing animation transaction" into oc-dev am:
ab7eb6de4d
am:
dcf479e5c0
Change-Id: I10f2dff543f975d92b2b6067867e3619c88261a2
Youngsang Cho [Fri, 12 May 2017 20:32:55 +0000 (20:32 +0000)]
Merge "Set notification TAG and style in TV PIP notification" into oc-dev
am:
c82737b98f
Change-Id: I94ff6a930b42471d9707dfe7fd5e32c501fba2ee
Android Build Merger (Role) [Fri, 12 May 2017 20:32:42 +0000 (20:32 +0000)]
Merge "Merge "Only force reset when adb is not enabled (i.e. mtp is)" into oc-dev am:
f874fd319e am:
c5a4576cab"
Jerry Zhang [Fri, 12 May 2017 20:31:51 +0000 (20:31 +0000)]
Merge "Only force reset when adb is not enabled (i.e. mtp is)" into oc-dev am:
f874fd319e
am:
c5a4576cab
Change-Id: I153a5ad3e4bd0de9a62ef39ebc7579f4916b79e3
Android Build Merger (Role) [Fri, 12 May 2017 20:31:21 +0000 (20:31 +0000)]
Merge "Merge "Do not notifyNoFullUi if no view is focused" into oc-dev am:
a44c50f362 am:
e9479a21b5"
Philip P. Moltmann [Fri, 12 May 2017 20:30:33 +0000 (20:30 +0000)]
Merge "Do not notifyNoFullUi if no view is focused" into oc-dev am:
a44c50f362
am:
e9479a21b5
Change-Id: Id0b50aa60e29d88e87c9e126f168e3effee0ebd3
Android Build Merger (Role) [Fri, 12 May 2017 20:30:08 +0000 (20:30 +0000)]
Merge "Merge "Remove forward matches before checking for default" into oc-dev am:
d53cbfd0dc am:
ba8b3f05b6"
TreeHugger Robot [Fri, 12 May 2017 20:29:56 +0000 (20:29 +0000)]
Merge "Import translations. DO NOT MERGE"
Philip P. Moltmann [Fri, 12 May 2017 20:29:15 +0000 (20:29 +0000)]
Merge "Remove forward matches before checking for default" into oc-dev am:
d53cbfd0dc
am:
ba8b3f05b6
Change-Id: Ic35779f6b6ad97dc1a6f83356dfa45e0d5b5f406
Android Build Merger (Role) [Fri, 12 May 2017 20:28:51 +0000 (20:28 +0000)]
Merge "Merge "Not specify return val of View#onSaveInstanceState" into oc-dev am:
1454afce82 am:
89d98d34cb"
Philip P. Moltmann [Fri, 12 May 2017 20:27:57 +0000 (20:27 +0000)]
Merge "Not specify return val of View#onSaveInstanceState" into oc-dev am:
1454afce82
am:
89d98d34cb
Change-Id: I93d3cbb6e0b6e7bbc7a535c0ebf437c16319075f
Android Build Merger (Role) [Fri, 12 May 2017 20:27:20 +0000 (20:27 +0000)]
Merge "Merge "Default grant mic, storage, camera to SMS app" into oc-dev am:
422a83de2c am:
f0cf3a95ed"
TreeHugger Robot [Fri, 12 May 2017 20:26:51 +0000 (20:26 +0000)]
Merge "Set notification TAG and style in TV PIP notification" into oc-dev
Eugene Susla [Fri, 12 May 2017 20:26:39 +0000 (20:26 +0000)]
Merge "Avoid activity leak via Companion callback" into oc-dev
am:
6c97781468
Change-Id: Ia40f15fac8dd2b4fc24a38d557d3cd853cd30bfa
Svet Ganov [Fri, 12 May 2017 20:26:05 +0000 (20:26 +0000)]
Merge "Default grant mic, storage, camera to SMS app" into oc-dev am:
422a83de2c
am:
f0cf3a95ed
Change-Id: I4f7a8379d6db6cdcc169029b5a13d8f0b2d2eacb
Android Build Merger (Role) [Fri, 12 May 2017 20:25:31 +0000 (20:25 +0000)]
Merge "Merge "Prevent multiple copies of android.hidl.manager-V1.0-java" into oc-dev am:
81e8d4b340 am:
4a45116c4e -s ours"
Badhri Jagan Sridharan [Fri, 12 May 2017 20:24:48 +0000 (20:24 +0000)]
Merge "Prevent multiple copies of android.hidl.manager-V1.0-java" into oc-dev am:
81e8d4b340
am:
4a45116c4e -s ours
Change-Id: Icbd7b99a4e15918afcb8dc9f9e53bac7ac9ba6d0
Juan Lang [Fri, 12 May 2017 20:23:56 +0000 (20:23 +0000)]
Merge "Import FooterPreferenceMixin and its dependencies into SettingsLib."
Felipe Leme [Fri, 12 May 2017 20:19:32 +0000 (20:19 +0000)]
Merge "Removed deprecated APIs." into oc-dev
am:
4b91fe8699
Change-Id: Ib53e3dff14e748d5715dcf112e828fb0f80b87a2
TreeHugger Robot [Fri, 12 May 2017 20:14:03 +0000 (20:14 +0000)]
Merge "Avoid activity leak via Companion callback" into oc-dev
TreeHugger Robot [Fri, 12 May 2017 20:13:10 +0000 (20:13 +0000)]
Merge "Removed deprecated APIs." into oc-dev
Chris Craik [Fri, 12 May 2017 20:11:42 +0000 (20:11 +0000)]
Merge "Update Bitmap#prepareToDraw doc" into oc-dev
am:
d4fff1565b
Change-Id: Ic685c51486bdcb58fa7879e7ad7d85d92bea2bd3
TreeHugger Robot [Fri, 12 May 2017 20:06:22 +0000 (20:06 +0000)]
Merge "Update Bitmap#prepareToDraw doc" into oc-dev
Jorim Jaggi [Fri, 12 May 2017 20:04:55 +0000 (20:04 +0000)]
Merge "Do not hold WM lock while closing animation transaction" into oc-dev
am:
ab7eb6de4d
Change-Id: I0794190b9ae0ec5aa3f8b285eedb461836c8f937
Jorim Jaggi [Fri, 12 May 2017 20:00:54 +0000 (20:00 +0000)]
Merge "Do not hold WM lock while closing animation transaction" into oc-dev
Jerry Zhang [Fri, 12 May 2017 19:50:20 +0000 (19:50 +0000)]
Merge "Only force reset when adb is not enabled (i.e. mtp is)" into oc-dev
am:
f874fd319e
Change-Id: I752aaae79bb2081add616d8183000ff63c6bf352
TreeHugger Robot [Fri, 12 May 2017 19:41:47 +0000 (19:41 +0000)]
Merge "Only force reset when adb is not enabled (i.e. mtp is)" into oc-dev
Philip P. Moltmann [Fri, 12 May 2017 19:31:14 +0000 (19:31 +0000)]
Merge "Do not notifyNoFullUi if no view is focused" into oc-dev
am:
a44c50f362
Change-Id: I159f8197df57ecf8775384d3a418c5b2589f357b
Philip P. Moltmann [Fri, 12 May 2017 19:29:03 +0000 (19:29 +0000)]
Merge "Remove forward matches before checking for default" into oc-dev
am:
d53cbfd0dc
Change-Id: I578c7e50fb9fbe84025508c30a86c6ab4865d385
Philip P. Moltmann [Fri, 12 May 2017 19:24:33 +0000 (19:24 +0000)]
Merge "Not specify return val of View#onSaveInstanceState" into oc-dev
am:
1454afce82
Change-Id: I070b96a2220c88e40b2d274ca03f5ea6fca04396
Svet Ganov [Fri, 12 May 2017 19:18:07 +0000 (19:18 +0000)]
Merge "Default grant mic, storage, camera to SMS app" into oc-dev
am:
422a83de2c
Change-Id: I483140b0dc20297f941775a34c4e73349a338f75
TreeHugger Robot [Fri, 12 May 2017 19:17:58 +0000 (19:17 +0000)]
Merge "Do not notifyNoFullUi if no view is focused" into oc-dev
TreeHugger Robot [Fri, 12 May 2017 19:17:32 +0000 (19:17 +0000)]
Merge "Remove forward matches before checking for default" into oc-dev
Doris Liu [Fri, 12 May 2017 19:15:50 +0000 (19:15 +0000)]
Merge "Fix racy clone" into oc-dev am:
a5b396b5cb
am:
2865d7a128
Change-Id: Ib35263dacfc98b8397d32a809b1c82416bcbf450
Badhri Jagan Sridharan [Fri, 12 May 2017 19:15:18 +0000 (19:15 +0000)]
Merge "Prevent multiple copies of android.hidl.manager-V1.0-java" into oc-dev
am:
81e8d4b340
Change-Id: Ic89a521342d386c9c3caad2766dd95f201c855be
TreeHugger Robot [Fri, 12 May 2017 19:14:47 +0000 (19:14 +0000)]
Merge "Not specify return val of View#onSaveInstanceState" into oc-dev
Stanley Tng [Fri, 12 May 2017 19:13:27 +0000 (19:13 +0000)]
Merge "Add Save and Restore of BluetoothOn setting" into oc-dev am:
e1a381cf41
am:
d6c97a913f
Change-Id: If96b84d1dfc08e37fad1e6e19ef4abd86df71ba9
TreeHugger Robot [Fri, 12 May 2017 19:10:18 +0000 (19:10 +0000)]
Merge "Default grant mic, storage, camera to SMS app" into oc-dev
TreeHugger Robot [Fri, 12 May 2017 19:07:35 +0000 (19:07 +0000)]
Merge "Prevent multiple copies of android.hidl.manager-V1.0-java" into oc-dev
Doris Liu [Fri, 12 May 2017 19:05:25 +0000 (19:05 +0000)]
Merge "Fix racy clone" into oc-dev
am:
a5b396b5cb
Change-Id: I718db73f8716b274de9efb94e297e3409ea9b46c
Selim Cinek [Fri, 12 May 2017 19:03:09 +0000 (19:03 +0000)]
Merge "Fixing the colorization of legacy media notifications" into oc-dev am:
0b84204185
am:
d95484c6d6
Change-Id: Idf26743203fb21f545a457d887706165e3efec41
Selim Cinek [Fri, 12 May 2017 19:00:52 +0000 (19:00 +0000)]
Merge "Don't flash colors when hinting" into oc-dev am:
275e0582c3
am:
8a7b5d5807
Change-Id: I6070e62da134660885721011ac77a0027ba8420c
Stanley Tng [Fri, 12 May 2017 18:54:39 +0000 (18:54 +0000)]
Merge "Add Save and Restore of BluetoothOn setting" into oc-dev
am:
e1a381cf41
Change-Id: Iced79a09a651676037718a6553cab7b16158ac14
Selim Cinek [Fri, 12 May 2017 18:52:42 +0000 (18:52 +0000)]
Merge "Fixing the colorization of legacy media notifications" into oc-dev
am:
0b84204185
Change-Id: I3015d7234d1d92712ec91de82d66e3ce23288795
Michael Wachenschwanz [Fri, 12 May 2017 18:49:27 +0000 (11:49 -0700)]
Fix JobSet getJobsByUser
Retrieve jobs from SparseArray with index using valueAt rather than get
(which uses keys not indices)
Fixes:
38198221
Test: manual
Change-Id: I636f5e0ef43456619700e27944eb6c2d65021643
Signed-off-by: Michael Wachenschwanz <mwachens@google.com>
Selim Cinek [Fri, 12 May 2017 18:48:44 +0000 (18:48 +0000)]
Merge "Fixing flakey tests" into oc-dev am:
5c857027bb
am:
df16d9ba23
Change-Id: I05922b665e6c737e7212223124a6f7f9bfb06da2
Selim Cinek [Fri, 12 May 2017 18:48:00 +0000 (18:48 +0000)]
Merge "Don't flash colors when hinting" into oc-dev
am:
275e0582c3
Change-Id: I60b8d4e356202d1ddef57a9c51976b514d527928
TreeHugger Robot [Fri, 12 May 2017 18:44:52 +0000 (18:44 +0000)]
Merge "Add SlashDrawable support to WorkMode tile"
Selim Cinek [Fri, 12 May 2017 18:42:42 +0000 (18:42 +0000)]
Merge "Fixing flakey tests" into oc-dev
am:
5c857027bb
Change-Id: I333afa8df38c565e75ef660b54b18b44e2e1414d
TreeHugger Robot [Fri, 12 May 2017 18:38:29 +0000 (18:38 +0000)]
Merge "Fix racy clone" into oc-dev
TreeHugger Robot [Fri, 12 May 2017 18:37:57 +0000 (18:37 +0000)]
Merge "Add Save and Restore of BluetoothOn setting" into oc-dev
Jorim Jaggi [Fri, 12 May 2017 18:37:54 +0000 (18:37 +0000)]
Merge "Don't set keyguard state to showing when service disabled" into oc-dev am:
6f5328a2cd
am:
ef40fb33eb
Change-Id: Ia63b1af06aedbb73396401ee0a5b2bba38bfe523
Selim Cinek [Fri, 12 May 2017 18:35:18 +0000 (18:35 +0000)]
Merge "Fixing the colorization of legacy media notifications" into oc-dev
Selim Cinek [Fri, 12 May 2017 18:32:52 +0000 (18:32 +0000)]
Merge "Don't flash colors when hinting" into oc-dev
Selim Cinek [Fri, 12 May 2017 18:32:25 +0000 (18:32 +0000)]
Merge "Fixing flakey tests" into oc-dev
Jorim Jaggi [Fri, 12 May 2017 18:28:12 +0000 (18:28 +0000)]
Merge "Don't set keyguard state to showing when service disabled" into oc-dev
am:
6f5328a2cd
Change-Id: I7bb58b1dc8e8c82f14da9c9e7e39c86509449ed5
TreeHugger Robot [Fri, 12 May 2017 18:23:12 +0000 (18:23 +0000)]
Merge "Copy preopted profiles to ref for first boot"
Sudheer Shanka [Fri, 12 May 2017 18:18:24 +0000 (18:18 +0000)]
Merge "Add time spent by uid per cpu frequency to batterystats." into oc-dev am:
5df9c5570e
am:
3ae1662024
Change-Id: I1954ae85025dabfebf452228b199cab07e892be2
TreeHugger Robot [Fri, 12 May 2017 18:16:19 +0000 (18:16 +0000)]
Merge "Don't set keyguard state to showing when service disabled" into oc-dev
TreeHugger Robot [Fri, 12 May 2017 18:14:44 +0000 (18:14 +0000)]
Merge "Refactor suggestion parser."
Android Build Merger (Role) [Fri, 12 May 2017 18:09:37 +0000 (18:09 +0000)]
Merge "Merge "More QS theme fixes for contrast" into oc-dev am:
3ad8c93e96 am:
9d9655a650 -s ours"
Sudheer Shanka [Fri, 12 May 2017 18:09:36 +0000 (18:09 +0000)]
Merge "Add time spent by uid per cpu frequency to batterystats." into oc-dev
am:
5df9c5570e
Change-Id: Ia15bc54c61a692a37ad9b84a28643afc798b52c7
Jason Monk [Fri, 12 May 2017 18:08:46 +0000 (18:08 +0000)]
Merge "More QS theme fixes for contrast" into oc-dev am:
3ad8c93e96
am:
9d9655a650 -s ours
Change-Id: I5aa5739be8e761bb12bb4d5fc83f841056d84a25
TreeHugger Robot [Fri, 12 May 2017 18:08:30 +0000 (18:08 +0000)]
Merge "Fix broken MenuItem coretests"
Sudheer Shanka [Fri, 12 May 2017 18:02:36 +0000 (18:02 +0000)]
Merge "Add time spent by uid per cpu frequency to batterystats." into oc-dev
Stanley Tng [Tue, 2 May 2017 04:27:31 +0000 (21:27 -0700)]
Add Save and Restore of BluetoothOn setting
This change will automatically save the Bluetooth On setting when
the user chooses to backup the phone settings into the cloud. This
setting is restored by the Setup Wizard (SUW) when configuring the
phone and this change will enable or disable the Bluetooth based
on this restored setting.
Bug:
35657817
Test: Manual test with Sailfish
Change-Id: Ie4518593af63f96f8c363f98941ca5260a3ec4bb
(cherry picked from commit
767f05feea67e642a76bd3e2e7633a8f5273f077)
Jason Monk [Fri, 12 May 2017 17:55:30 +0000 (17:55 +0000)]
Merge "More QS theme fixes for contrast" into oc-dev am:
3ad8c93e96
am:
9d9655a650 -s ours
Change-Id: I5579472ff5e9018bacf14e6f1ec61f06dab4f3c9
Jason Monk [Fri, 12 May 2017 17:39:20 +0000 (17:39 +0000)]
Merge "More QS theme fixes for contrast" into oc-dev
am:
3ad8c93e96
Change-Id: I85e10238ddfceec5cc497868d506e8a3361fb03a
Android Build Merger (Role) [Fri, 12 May 2017 17:38:23 +0000 (17:38 +0000)]
Merge "Merge "Make sure fd is always initialized" into oc-dev am:
b827c5234c am:
cc133c1265"
Svetoslav Ganov [Fri, 12 May 2017 17:37:27 +0000 (17:37 +0000)]
Merge "Make sure fd is always initialized" into oc-dev am:
b827c5234c
am:
cc133c1265
Change-Id: I79ec9a7eb92f5fc2fb93a89a2f076d0eb57c2eb9
TreeHugger Robot [Fri, 12 May 2017 17:36:45 +0000 (17:36 +0000)]
Merge "Fix recent apps in system UI for Skia pipeline"
TreeHugger Robot [Fri, 12 May 2017 17:33:06 +0000 (17:33 +0000)]
Merge "More QS theme fixes for contrast" into oc-dev
Felipe Leme [Fri, 12 May 2017 16:52:07 +0000 (09:52 -0700)]
Removed deprecated APIs.
Test: CtsAutoFillServiceTestCases pass
Test: manual verification with existing service
Bug:
37563972
Change-Id: Ibea2810f9230f06e59d2d81e4ba853de54987956
Evan Laird [Fri, 12 May 2017 16:52:09 +0000 (12:52 -0400)]
Add SlashDrawable support to WorkMode tile
Will have to recenter the WorkMode tile itself, as the slash is
dead-center now but the tile isn't.
Test: visual; runtest systemui
Change-Id: Iebc52702b7a735378801815105cf2e67b7276ac1
Svetoslav Ganov [Fri, 12 May 2017 17:28:21 +0000 (17:28 +0000)]
Merge "Make sure fd is always initialized" into oc-dev
am:
b827c5234c
Change-Id: Ifdb14e0d6a79402f8c04fd36b342d1fdfd4a4950
Svet Ganov [Mon, 10 Apr 2017 04:24:31 +0000 (21:24 -0700)]
Default grant mic, storage, camera to SMS app
Test: CTS tests updated in same topic
bug:
36713956
Change-Id: I496d8f8dac86594956dcdeb5afafa5b210e28de4
Svetoslav Ganov [Fri, 12 May 2017 17:16:33 +0000 (17:16 +0000)]
Merge "Make sure fd is always initialized" into oc-dev
Todd Kennedy [Fri, 12 May 2017 16:43:33 +0000 (16:43 +0000)]
Merge "Remove lots of log spew" into oc-dev am:
e96d66dbc1
am:
fe270353c8
Change-Id: I1aa4f633fcbfe5e0bc5309cb68e3d712e1cab08a
Wale Ogunwale [Fri, 12 May 2017 16:40:06 +0000 (16:40 +0000)]
Merge "Prevent premature display of starting window." into oc-dev am:
f1a00e2b17
am:
e4f0e1edfd
Change-Id: I7428ae92d9f080abb7a3e3106ad017ff242288ee
Todd Kennedy [Fri, 12 May 2017 16:30:27 +0000 (16:30 +0000)]
Merge "Remove lots of log spew" into oc-dev
am:
e96d66dbc1
Change-Id: I0a32587ddaa359a61b0cdda54effde80dd98a46c
Wale Ogunwale [Fri, 12 May 2017 16:25:43 +0000 (16:25 +0000)]
Merge "Prevent premature display of starting window." into oc-dev
am:
f1a00e2b17
Change-Id: Ief49f064ef7de0ea8decd6a3bd73ed63553b61ae
TreeHugger Robot [Fri, 12 May 2017 16:23:42 +0000 (16:23 +0000)]
Merge "Remove lots of log spew" into oc-dev
Juan Lang [Thu, 4 May 2017 23:59:46 +0000 (16:59 -0700)]
Import FooterPreferenceMixin and its dependencies into SettingsLib.
This will allow this class to be reused by apps other than Settings.
Test: make RunSettingsLibRoboTests && make RunSettingsRoboTests &&
make RunSettingsGoogleRoboTests
Change-Id: Ic4aa3945df71357fb2f99262ab299020e94a6eb9
Philip P. Moltmann [Fri, 12 May 2017 16:22:07 +0000 (16:22 +0000)]
Merge "Safeguard against uncommon scenarios when pruning" into oc-dev am:
20d36c70cd
am:
94c6688617
Change-Id: I143a4e7cd20897b71eab8fa92390f7aac9df07ef
TreeHugger Robot [Fri, 12 May 2017 16:17:55 +0000 (16:17 +0000)]
Merge "Prevent premature display of starting window." into oc-dev
Philip P. Moltmann [Fri, 12 May 2017 16:12:05 +0000 (16:12 +0000)]
Merge "Safeguard against uncommon scenarios when pruning" into oc-dev
am:
20d36c70cd
Change-Id: I447e82c5f9b137279dc03aeb50f65e143c8050de
Philip P. Moltmann [Fri, 12 May 2017 16:03:59 +0000 (16:03 +0000)]
Merge "Safeguard against uncommon scenarios when pruning" into oc-dev
Stan Iliev [Fri, 5 May 2017 23:41:36 +0000 (19:41 -0400)]
Fix recent apps in system UI for Skia pipeline
Enable HW Bitmaps for Skia pipeline just enough to make
recent apps list working by adding support for BitmapShader.
Drawing HW bitmaps in a canvas is also supported.
Test: recent apps work, HWUI unit tests pass, CTS tests pass.
bug:
38136140
Change-Id: Ibd06c859c86dc213310d5ce5272497e1882d0cc6
TreeHugger Robot [Fri, 12 May 2017 15:07:20 +0000 (15:07 +0000)]
Merge "Correctly abort dispatching on ANR."
TreeHugger Robot [Fri, 12 May 2017 15:06:51 +0000 (15:06 +0000)]
Merge "More QS theme fixes for contrast"
OSDN Git Service
