OSDN Git Service
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
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
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
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
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
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
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
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:16:19 +0000 (18:16 +0000)]
Merge "Don't set keyguard state to showing when service disabled" into oc-dev
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
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:39:20 +0000 (17:39 +0000)]
Merge "More QS theme fixes for contrast" into oc-dev
am:
3ad8c93e96
Change-Id: I85e10238ddfceec5cc497868d506e8a3361fb03a
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
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: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
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
Todd Kennedy [Thu, 11 May 2017 20:31:04 +0000 (13:31 -0700)]
Remove lots of log spew
Change-Id: Ia8dbc32c72585c14f9e1a2c5364ab2663bbf97ea
Fixes:
33351736
Test: Manual; start the system and enjoy how little PackageManager spams
Bryan Mawhinney [Fri, 12 May 2017 14:30:24 +0000 (14:30 +0000)]
Merge "Re-Re-enable SettingsBackupTest" into oc-dev
am:
731c41950a
Change-Id: I1cae217a9a0fe3dc6a86e1c6da3eb54b11f55968
TreeHugger Robot [Fri, 12 May 2017 14:25:01 +0000 (14:25 +0000)]
Merge "Re-Re-enable SettingsBackupTest" into oc-dev
Wale Ogunwale [Fri, 12 May 2017 14:17:36 +0000 (07:17 -0700)]
Prevent premature display of starting window.
- When starting an activity, don't tell window manager to make the
windows visible is the keygaurd visibility for the activity is false.
Instead let the activity windows be made visible once the keygaurd
visibility transitions to true.
- Don't send duplicate visibility change request to window manger if we
are not changing state.
Fixes:
34545029
Test: Open a hangouts notification message on the lock-screen
and make sure the starting window doesn't flash.
Change-Id: I745e985766a1af97203e1d22b6443dabdd0c0363
Jason Monk [Tue, 9 May 2017 17:50:47 +0000 (13:50 -0400)]
More QS theme fixes for contrast
Test: visual
Merged-In: I4494e92ebf79bbc20c30a18f5ac13228801a3e54
Change-Id: Ifb03403042561ec23e67159eb51387a460d4f90b
Fixes:
37443237
Paul Duffin [Fri, 12 May 2017 13:03:29 +0000 (13:03 +0000)]
Merge changes I4c0e7fdd,I9ea3827a am:
c876eece68 am:
557996e1d0
am:
a158b3cb15
Change-Id: Ia76a1e34c541c64d4b226b9492ca6f05d30fc5a4
Paul Duffin [Fri, 12 May 2017 12:57:58 +0000 (12:57 +0000)]
Merge changes I4c0e7fdd,I9ea3827a am:
c876eece68
am:
557996e1d0
Change-Id: I5b69ec04dbb80c826f43bd288e68cd74d1b99242
Paul Duffin [Fri, 12 May 2017 12:51:25 +0000 (12:51 +0000)]
Merge changes I4c0e7fdd,I9ea3827a
am:
c876eece68
Change-Id: Idf7bfe0bf3d9a770772bd364b9c6d1a9db6d9cdf
Paul Duffin [Fri, 12 May 2017 12:41:24 +0000 (12:41 +0000)]
Merge changes I4c0e7fdd,I9ea3827a
* changes:
Remove dependency on internal FileUtils class
Remove dependency on com.google.android.collect classes
Julia Reynolds [Fri, 12 May 2017 12:20:21 +0000 (12:20 +0000)]
Merge "Show misc channel with pre-upgrade fields" into oc-dev
am:
34bc4af810
Change-Id: I126f04e8551e68b74b076bea10f30964b8d2be00
Julia Reynolds [Fri, 12 May 2017 12:14:07 +0000 (12:14 +0000)]
Merge "Show misc channel with pre-upgrade fields" into oc-dev
Abodunrinwa Toki [Fri, 12 May 2017 12:00:46 +0000 (12:00 +0000)]
Merge "TRON: Count smart selection events." into oc-dev
am:
6bf9b9a5f3
Change-Id: If2b0f491dd0a2533d6a17c2ad8ef6d1b995ae9ca
Jorim Jaggi [Thu, 11 May 2017 14:27:06 +0000 (16:27 +0200)]
Do not hold WM lock while closing animation transaction
Animation transactions can be blocking, leading to total
window manager starvation. Fix this by not holding lock.
Test: Double tap recents button, make sure it's always responsive
Change-Id: I8e09e04f243d2bfc09fb68097846a42e76c7cab5
Fixes:
38192114
TreeHugger Robot [Fri, 12 May 2017 11:54:32 +0000 (11:54 +0000)]
Merge "TRON: Count smart selection events." into oc-dev
Diego Perez [Fri, 12 May 2017 11:25:12 +0000 (11:25 +0000)]
Merge "Disable font test temporarily" into oc-dev
am:
152f6c8e04
Change-Id: I548bee7f45bfc7f364327233c4b4e1faf75139a1
TreeHugger Robot [Fri, 12 May 2017 11:21:30 +0000 (11:21 +0000)]
Merge "Disable font test temporarily" into oc-dev
Jorim Jaggi [Fri, 12 May 2017 11:08:12 +0000 (11:08 +0000)]
Merge "Fix all issues with SystemUI visibility and transitions" into oc-dev
am:
c5b2bf1818
Change-Id: I3cd753050489728c6bf1fdf12f315d444a49cdd7
Jorim Jaggi [Fri, 12 May 2017 11:02:27 +0000 (11:02 +0000)]
Merge "Fix all issues with SystemUI visibility and transitions" into oc-dev
Amin Shaikh [Fri, 12 May 2017 06:46:27 +0000 (06:46 +0000)]
Merge changes from topic 'onarevert' into oc-dev
am:
fa0b28220b
Change-Id: I744b3dd5c4b58042e1460f161c2813f34784dc32
Winson Chung [Fri, 12 May 2017 06:41:54 +0000 (06:41 +0000)]
Merge "Allow Recents to rotate freely." into oc-dev
am:
05aa65cfb9
Change-Id: I455377b7bf3eea943356298532a06bfd62ff7601
Svet Ganov [Fri, 12 May 2017 06:35:43 +0000 (06:35 +0000)]
Merge "System/root/shell need to explicitly ask for static libs to get them" into oc-dev
am:
c3db339987
Change-Id: I9c00d0c1040929a55638436d7ae703287fe62620
Jorim Jaggi [Fri, 12 May 2017 06:25:46 +0000 (06:25 +0000)]
Merge "Reduce impact of RenderThread in system_server" into oc-dev
am:
bb9218778c
Change-Id: Id5f5091048fbf3838b836afae90642984ab9fbfb
Chris Wren [Fri, 12 May 2017 05:57:40 +0000 (05:57 +0000)]
Merge changes from topic 'b/
36021111' into oc-dev
am:
69ab8e1d56
Change-Id: I4bf9b7425c86a8725e9d7c055ab4c4f389fe3a2b
Christopher Tate [Fri, 12 May 2017 04:43:31 +0000 (04:43 +0000)]
Merge "Fix #
38218977 : NPE restoring widget mappings" into oc-dev
am:
a8fe244466
Change-Id: I26ee734e4924495db31fe2db7c3e726233f923bb
TreeHugger Robot [Fri, 12 May 2017 04:40:21 +0000 (04:40 +0000)]
Merge changes from topic 'onarevert' into oc-dev
* changes:
Create a NotificationChannel for ONA.
Revert "Delete old WifiNotificationController strings."
Winson Chung [Fri, 12 May 2017 04:26:32 +0000 (04:26 +0000)]
Merge "Minor tweak, defer building PiP notification until after transition ends" into oc-dev
am:
46853ab04f
Change-Id: Ie9f3f59263b9672294de10a2500abb69d3878135
Eric Laurent [Fri, 12 May 2017 04:23:17 +0000 (04:23 +0000)]
Merge "PhoneWindowManager: allow volume keys in VoIP calls and screen off" into oc-dev
am:
b0cce1f160
Change-Id: Ib4cf3fb23110fe9e9e32e10ff01b19e717afa07d
Christopher Tate [Fri, 12 May 2017 04:19:12 +0000 (04:19 +0000)]
Merge "Accommodate service disconnect / package update race" into oc-dev
am:
a3301df508
Change-Id: Ibafad32d243ece75a1e034b84fd81f7f0ae3e4b2
Doris Liu [Thu, 11 May 2017 23:50:53 +0000 (16:50 -0700)]
Fix racy clone
BUG:
38184803
Test: cts AnimatorSet tests
Change-Id: I308ae9cc014f13a6aa928d8d82e339f476f4b3de
Andreas Gampe [Fri, 12 May 2017 04:16:09 +0000 (04:16 +0000)]
Merge "OtaDexopt: Ensure float format for progress command" into oc-dev
am:
4c8181cb48
Change-Id: I8a243d16573ac5af852515cf8d3f018c00b43655
Adam Lesinski [Fri, 12 May 2017 04:10:49 +0000 (04:10 +0000)]
Merge "AAPT: Include empty locale in getLocales" into oc-dev
am:
19af4cc375
Change-Id: Idcac3756eede932c7924ccc3ef3edc7e12b7a10b
Adam Lesinski [Fri, 12 May 2017 04:01:26 +0000 (04:01 +0000)]
Merge "BatteryStats: Stop reading kernel memory stats when unvailable" into oc-dev
am:
120d7b219d
Change-Id: Ib408bed1686392f6bd846071277ac29cc70d54e7
Sudheer Shanka [Wed, 10 May 2017 01:26:18 +0000 (18:26 -0700)]
Add time spent by uid per cpu frequency to batterystats.
Currently we have total user and system cpu time spent by the uid
in the batterystats. This change will add times spent by the uid
at each different cpu frequency to the batterystats dump which will
help in better understanding the battery usage.
Bug:
34133340
Test: manual
Change-Id: I567dc75875eb58543c0e71572d0b440e87dbb4b9
Makoto Onuki [Fri, 12 May 2017 03:54:58 +0000 (03:54 +0000)]
Merge "Make batterystats less chatty" into oc-dev
am:
89d64cbbd9
Change-Id: Icc72768848756547c08eac7958b8e34a410dd6ba
Kenny Guy [Fri, 12 May 2017 03:51:39 +0000 (03:51 +0000)]
Merge "Cleanup API that is already @removed" into oc-dev
am:
33b4964874
Change-Id: I933de065f75417e16541c86089e981b3a9fbd362
TreeHugger Robot [Fri, 12 May 2017 03:47:17 +0000 (03:47 +0000)]
Merge "Allow Recents to rotate freely." into oc-dev
Aurimas Liutikas [Fri, 12 May 2017 03:47:09 +0000 (03:47 +0000)]
Merge "Suppress AppCacheTest tests that cause am instrument failure." into oc-dev
am:
cd32b42e1c
Change-Id: I357809d19e5ae3f51ae11693675899e45f79152b
TreeHugger Robot [Fri, 12 May 2017 03:46:54 +0000 (03:46 +0000)]
Merge "System/root/shell need to explicitly ask for static libs to get them" into oc-dev
Hall Liu [Fri, 12 May 2017 03:30:07 +0000 (03:30 +0000)]
Merge "getStreamingServices for embms" am:
b73fe9a751 am:
1d274ca5ec
am:
a73e417752
Change-Id: I027359f2f9591ca1600b9b270413ae9b74fb7909
nharold [Fri, 12 May 2017 03:18:54 +0000 (03:18 +0000)]
Merge "Add hidden APIs to get the cached SignalStrength from SST" am:
5b8a9c873f am:
cca5fbe779
am:
8d361350ff
Change-Id: Ief9ba9b1fcd36db763d403c60be53b42c3d18890
Android Build Merger (Role) [Fri, 12 May 2017 02:54:45 +0000 (02:54 +0000)]
Merge "Merge "Fix app bounds for pinned stack" into oc-dev am:
4116913e3a" into oc-dev-plus-aosp
Andrii Kulian [Fri, 12 May 2017 02:51:14 +0000 (02:51 +0000)]
Merge "Fix app bounds for pinned stack" into oc-dev
am:
4116913e3a
Change-Id: I8e58fd93793d2f55f008551022aafdaa7d3693b8
Svetoslav Ganov [Fri, 12 May 2017 02:48:26 +0000 (02:48 +0000)]
Merge "Init MemoryIntArray#mFd with -1" am:
d6eaa80590 am:
a3f14a1531
am:
b1274a057f
Change-Id: I1db50e323b452520c766be40a0c6524a12e14194
Android Build Merger (Role) [Fri, 12 May 2017 02:36:09 +0000 (02:36 +0000)]
Merge "Merge "Add key for carrier_volte_provisioned" am:
79d3648cc2 am:
e050b5196b am:
4c91fdbd0b -s ours" into oc-dev-plus-aosp
TreeHugger Robot [Fri, 12 May 2017 02:31:14 +0000 (02:31 +0000)]
Merge "Reduce impact of RenderThread in system_server" into oc-dev
Brad Ebinger [Fri, 12 May 2017 02:29:28 +0000 (02:29 +0000)]
Merge "Add key for carrier_volte_provisioned" am:
79d3648cc2 am:
e050b5196b
am:
4c91fdbd0b -s ours
Change-Id: I03ba14bdabdd55fe607bf834102f116489eb4ce0
Robert Shih [Fri, 12 May 2017 02:28:18 +0000 (02:28 +0000)]
Merge "AudioCapabilities: handle non-standard codec max input channels" into oc-dev
am:
ffb563d82d
Change-Id: I9762506997220b4f22589cc3c6542798175d873c
Felipe Leme [Fri, 12 May 2017 02:20:59 +0000 (02:20 +0000)]
Merge "Decrease default number of partitions from 64 to 10." into oc-dev
am:
203ec51e2b
Change-Id: I41e7c2fe4b0022330d1b67580334030e411dfbce
Android Build Merger (Role) [Fri, 12 May 2017 02:16:27 +0000 (02:16 +0000)]
Merge "Merge "Only save focus in keyboard navigation clusters when appropriate" into oc-dev am:
f14aea9f8b" into oc-dev-plus-aosp
Android Build Merger (Role) [Fri, 12 May 2017 02:16:19 +0000 (02:16 +0000)]
Merge "Merge "Merge "Telephony: Fix the failure of copying SMS to SIM card for sub2" am:
7eca824ce3 am:
1f354082c0" into nyc-mr2-dev-plus-aosp am:
94d78f5e31" into oc-dev-plus-aosp
Evan Rosky [Fri, 12 May 2017 02:14:40 +0000 (02:14 +0000)]
Merge "Only save focus in keyboard navigation clusters when appropriate" into oc-dev
am:
f14aea9f8b
Change-Id: If113fe3fc6516b293a532a076ed37c566eddac2f
Chen Xu [Fri, 12 May 2017 02:14:29 +0000 (02:14 +0000)]
Merge "Merge "Telephony: Fix the failure of copying SMS to SIM card for sub2" am:
7eca824ce3 am:
1f354082c0" into nyc-mr2-dev-plus-aosp
am:
94d78f5e31
Change-Id: Ic3c4ea573ee8cff925d876e3205e923136a083e2
Android Build Merger (Role) [Fri, 12 May 2017 02:14:12 +0000 (02:14 +0000)]
Merge "Merge "Only spawn one binder thread for screencap." into oc-dev am:
b1edc48db0" into oc-dev-plus-aosp