OSDN Git Service
Felipe Leme [Fri, 28 Apr 2017 09:32:24 +0000 (09:32 +0000)]
Merge "Refactored Autofill to move starting flag out of Session." into oc-dev
am:
b63d261f9c
Change-Id: Icf8f2b15b932acfe45fe48ec1b79307280957a12
TreeHugger Robot [Fri, 28 Apr 2017 09:24:59 +0000 (09:24 +0000)]
Merge "Refactored Autofill to move starting flag out of Session." into oc-dev
Narayan Kamath [Fri, 28 Apr 2017 08:48:28 +0000 (08:48 +0000)]
Merge "AppErrors: Refine notion of "interesting" processes for b/g ANRs." into oc-dev
am:
048306f318
Change-Id: Ia8bf43396ca91d2f26ad21933988f665fa2204ca
Narayan Kamath [Fri, 28 Apr 2017 08:42:34 +0000 (08:42 +0000)]
Merge "AppErrors: Refine notion of "interesting" processes for b/g ANRs." into oc-dev
Erik Kline [Fri, 28 Apr 2017 08:16:11 +0000 (08:16 +0000)]
Merge "Notify WifiManager of interface state changes" am:
8e97274186 am:
241a7f15f2
am:
2439781719
Change-Id: I5b3f640f4dd5cfac7555ddf1f6ae752899caddb0
Erik Kline [Fri, 28 Apr 2017 08:11:04 +0000 (08:11 +0000)]
Merge "Notify WifiManager of interface state changes" am:
8e97274186
am:
241a7f15f2
Change-Id: I4360a558181624004a88074da92b3bbf202a6a18
Erik Kline [Fri, 28 Apr 2017 08:04:31 +0000 (08:04 +0000)]
Merge "Notify WifiManager of interface state changes"
am:
8e97274186
Change-Id: I6e9594805f9f55da53cf29e322829b1d2ff2f058
Treehugger Robot [Fri, 28 Apr 2017 07:55:47 +0000 (07:55 +0000)]
Merge "Notify WifiManager of interface state changes"
Felipe Leme [Fri, 28 Apr 2017 06:48:47 +0000 (06:48 +0000)]
Merge "Changed HtmlInfo.getAttributes() to return List instead of ArrayList" into oc-dev
am:
3dfd827574
Change-Id: I9e8a9b81c890eb08bb089faaa1c3b3bd9fc9893f
TreeHugger Robot [Fri, 28 Apr 2017 06:42:17 +0000 (06:42 +0000)]
Merge "Changed HtmlInfo.getAttributes() to return List instead of ArrayList" into oc-dev
Svetoslav Ganov [Fri, 28 Apr 2017 06:41:40 +0000 (06:41 +0000)]
Merge "Implement the rest of autofill importance modes" into oc-dev
am:
70c0221813
Change-Id: I5c03a2cde466a87b6f8067838b411319ba907fb2
Felipe Leme [Wed, 26 Apr 2017 19:36:01 +0000 (12:36 -0700)]
Refactored Autofill to move starting flag out of Session.
Otherwise, all onFillRequest() calls in the same partition would use
the same flags.
Fixes:
37675138
Test: existing CtsAutoFillServiceTestCases pass
Test: CtsAssistTestCases pass
Test: PartitionedActivityTest.testAutofill4ParitionsMixManualAndAuto() pass
Change-Id: I03c8a036637bae534904d4f41265e451088cf940
Svetoslav Ganov [Fri, 28 Apr 2017 06:35:05 +0000 (06:35 +0000)]
Merge "Force autofill on overflow only if empty" into oc-dev
am:
64cf2bb19b
Change-Id: Idbc5b0b7414e5537bb4f734cef439c2ebf449324
Svetoslav Ganov [Fri, 28 Apr 2017 06:29:58 +0000 (06:29 +0000)]
Merge "Implement the rest of autofill importance modes" into oc-dev
Svetoslav Ganov [Fri, 28 Apr 2017 06:29:19 +0000 (06:29 +0000)]
Merge "Force autofill on overflow only if empty" into oc-dev
Felipe Leme [Thu, 27 Apr 2017 22:24:19 +0000 (15:24 -0700)]
Changed HtmlInfo.getAttributes() to return List instead of ArrayList
Fixes:
37747396
Test: CtsAutoFillServiceTestCases pass
Change-Id: Ief53e6d71805f561577b73e57a9d36bc3769862a
Erik Kline [Thu, 27 Apr 2017 11:57:23 +0000 (20:57 +0900)]
Notify WifiManager of interface state changes
Test: as follows
- built
- flashed
- booted
- "runtest frameworks-net" passes
(except for an unrelated IpConnectivityMetricsTest error)
Bug:
31466854
Bug:
32163131
Change-Id: I702ea79eb2c02604761e4e1ebcd5f9e445178efb
Lorenzo Colitti [Fri, 28 Apr 2017 04:04:21 +0000 (04:04 +0000)]
Merge "Address ConnectivityManager API comments." into oc-dev
am:
ce8eae73af
Change-Id: I7024b4fe23ab12760fb452a59929df886912b104
Lorenzo Colitti [Fri, 28 Apr 2017 03:58:06 +0000 (03:58 +0000)]
Merge "Address ConnectivityManager API comments." into oc-dev
Phil Weaver [Fri, 28 Apr 2017 03:52:30 +0000 (03:52 +0000)]
Merge "Rename FingerprintGestureCallback.onGesture" into oc-dev
am:
cfbe105e4b
Change-Id: Iedaa4a9f6969cb6f935ee652404669827842e88b
Casey Burkhardt [Fri, 28 Apr 2017 03:50:26 +0000 (03:50 +0000)]
Merge "@NonNull on AccessibilityButtonController methods" into oc-dev
am:
4b426d799f
Change-Id: Ie04d4fe17cc1af92eab5768561d4eff4b7b7408b
Kevin Chyn [Fri, 28 Apr 2017 03:48:08 +0000 (03:48 +0000)]
Merge "FP won't wake device if daemon dies" into oc-dev
am:
e3d3ffcb19
Change-Id: I66737d8a07f8147a5929559f79cfa6d8a4780881
TreeHugger Robot [Fri, 28 Apr 2017 03:41:57 +0000 (03:41 +0000)]
Merge "Rename FingerprintGestureCallback.onGesture" into oc-dev
TreeHugger Robot [Fri, 28 Apr 2017 03:41:29 +0000 (03:41 +0000)]
Merge "@NonNull on AccessibilityButtonController methods" into oc-dev
TreeHugger Robot [Fri, 28 Apr 2017 03:40:38 +0000 (03:40 +0000)]
Merge "FP won't wake device if daemon dies" into oc-dev
Jean-Michel Trivi [Fri, 28 Apr 2017 03:35:13 +0000 (03:35 +0000)]
Merge "AudioService: unmute media on connection of new audio accessory" into oc-dev
am:
97c1d58ea4
Change-Id: Idef1ca709a88bace5fbee47f4e4910e96139ae65
TreeHugger Robot [Fri, 28 Apr 2017 03:27:43 +0000 (03:27 +0000)]
Merge "AudioService: unmute media on connection of new audio accessory" into oc-dev
Erik Kline [Fri, 28 Apr 2017 03:09:04 +0000 (03:09 +0000)]
Merge "Switch to WifiManager.{start,stop}SoftAp()" into oc-dev
am:
f0913324ba
Change-Id: I11b071ebcda58c3f475075772df6a39143939db8
Erik Kline [Fri, 28 Apr 2017 03:01:06 +0000 (03:01 +0000)]
Merge "Switch to WifiManager.{start,stop}SoftAp()" into oc-dev
Eugene Susla [Fri, 28 Apr 2017 02:29:14 +0000 (02:29 +0000)]
Merge "Follow acronym convention for Companion BLE filter" into oc-dev
am:
81d9230c88
Change-Id: I45fac28b65277448fb5a2ba59121ffeed8a12b15
TreeHugger Robot [Fri, 28 Apr 2017 02:21:41 +0000 (02:21 +0000)]
Merge "Follow acronym convention for Companion BLE filter" into oc-dev
Erik Kline [Fri, 28 Apr 2017 02:15:51 +0000 (02:15 +0000)]
Merge "WifiManager: add updateInterfaceIpState" into oc-dev
am:
95581dacb2 -s ours
Change-Id: Ia0f26ea98d0cd20a01e997a608c5794934207c50
Rebecca Silberstein [Fri, 28 Apr 2017 02:07:12 +0000 (02:07 +0000)]
WifiManager: add updateInterfaceIpState
am:
720cac4536 -s ours
Change-Id: I683a67b6cac37e68e2a09e56d64ca6db5adec707
Erik Kline [Fri, 28 Apr 2017 01:56:57 +0000 (01:56 +0000)]
Merge "WifiManager: add updateInterfaceIpState" into oc-dev
Felipe Leme [Fri, 28 Apr 2017 01:54:04 +0000 (01:54 +0000)]
Merge "Fixed requestAutofill()." into oc-dev
am:
17238a3f1a
Change-Id: Ibcf4075a3f12c82bbd968d2e2fb63a3dd8ea5bbc
Philip P. Moltmann [Fri, 28 Apr 2017 01:45:46 +0000 (01:45 +0000)]
Merge "Fix LoginActivityTest#testIsServiceEnabled" into oc-dev
am:
81c591b77e
Change-Id: I1fd6c13921b9563aab42fa054c3ade403bc52f1a
Selim Gurun [Fri, 28 Apr 2017 01:41:40 +0000 (01:41 +0000)]
Merge "Hide onMovedToDisplay for WebView" into oc-dev
am:
a7045f59e0
Change-Id: I1f8bba3810c1945c38c33b38ace0a327b6c404f4
Philip P. Moltmann [Fri, 28 Apr 2017 01:39:27 +0000 (01:39 +0000)]
Merge "Do not autofill twice" into oc-dev
am:
a896d6abf4
Change-Id: I3a17ae8e3d4c547bcd2cf7a4302870b028c6328f
TreeHugger Robot [Fri, 28 Apr 2017 01:36:04 +0000 (01:36 +0000)]
Merge "Fixed requestAutofill()." into oc-dev
Winson Chung [Fri, 28 Apr 2017 01:31:58 +0000 (01:31 +0000)]
Merge "Only sublist array by size or limit, whichever is smaller." into oc-dev
am:
a2f102b175
Change-Id: Iefe4e55a2a048e66ae60c198b3fa4550ff423515
Chad Brubaker [Fri, 28 Apr 2017 01:29:57 +0000 (01:29 +0000)]
Merge "Expose missing accessibility settings to instant apps" into oc-dev
am:
4108aa77e8
Change-Id: I8bd5c9ee05c805129dd5d6b2eea1fac48ba923db
Mathias Agopian [Fri, 28 Apr 2017 01:25:27 +0000 (01:25 +0000)]
Merge "Plumb gralloc producer/consumer bits correctly" into oc-dev
am:
b9a2e32130
Change-Id: I3ea8572dd89f5cc71dd74dd7b21e559b30d5cc4d
TreeHugger Robot [Fri, 28 Apr 2017 01:21:48 +0000 (01:21 +0000)]
Merge "Fix LoginActivityTest#testIsServiceEnabled" into oc-dev
Selim Gurun [Fri, 28 Apr 2017 01:20:25 +0000 (01:20 +0000)]
Merge "Hide onMovedToDisplay for WebView" into oc-dev
Selim Cinek [Fri, 28 Apr 2017 01:20:22 +0000 (01:20 +0000)]
Merge changes from topic 'music_extraction' into oc-dev
am:
e44061f9e7
Change-Id: I8c5a58540be4e96aea4c48a8365f512d508ff1c5
TreeHugger Robot [Fri, 28 Apr 2017 01:19:40 +0000 (01:19 +0000)]
Merge "Do not autofill twice" into oc-dev
Svet Ganov [Wed, 26 Apr 2017 22:54:27 +0000 (15:54 -0700)]
Implement the rest of autofill importance modes
Test: CTS tests pass; augmented tests to verify new behavior
bug:
36171235
Change-Id: Ieff2b8d7e1c3a3eba456deca7bed70c8e29c415e
Jakub Pawlowski [Fri, 28 Apr 2017 01:14:05 +0000 (01:14 +0000)]
Merge "Bluetooth: Add constants to ScanResult" into oc-dev
am:
fc61f37341
Change-Id: I9e9d002b8d6b4b6b1884278f48ff5255d2615860
Jean-Michel Trivi [Thu, 27 Apr 2017 22:37:34 +0000 (15:37 -0700)]
AudioService: unmute media on connection of new audio accessory
When plugging in a new audio device:
- if the device is considered an external accessory
- and media volume is muted
- and the media volume is non-zero for this device
- and it is used for media playback
then unmute STREAM_MUSIC.
Log when AVRCP absolute volume is supported.
Test: mute media volume with icon, insert headset then play music, music should not be muted
Bug:
30440012
Change-Id: I102f26c435fa5cbd1e1bc4c14f51629d3cc51fb3
Phil Weaver [Fri, 28 Apr 2017 01:12:01 +0000 (01:12 +0000)]
Merge "Remove reference to removed string" into oc-dev
am:
9a5dfd393b
Change-Id: Ie519286bc2d3319222f29f41de0057c56aa56ebd
Erik Wolsheimer [Fri, 28 Apr 2017 01:10:00 +0000 (01:10 +0000)]
Merge "Add logging around dream start/stop am:
4769b54d49 am:
b50a0cdd5e" into oc-dev
am:
1702c33ceb
Change-Id: Ic91af9a7c17bf1128f6b2f5c8c8e057255d460f7
Todd Kennedy [Fri, 28 Apr 2017 01:07:34 +0000 (01:07 +0000)]
Merge "add 'changes' cmd to dumpsys" into oc-dev
am:
38b58abaac
Change-Id: Ie3746f8f06a74c6a5954113032ad6d0e9e4cd4e8
Adam Lesinski [Fri, 28 Apr 2017 01:04:51 +0000 (01:04 +0000)]
Merge "AAPT2: Add workaround for non-standard package IDs" into oc-dev
am:
e7172ff9fb
Change-Id: I7b8e53f8394e41433ceebe4f6e477f8561e49807
Wei Wang [Fri, 28 Apr 2017 01:01:55 +0000 (01:01 +0000)]
Merge "Throttle wifi scan requests from background apps (1/2)." into oc-dev
am:
afd8d9e2b2
Change-Id: I92ca90c34a9fadeabf324a84ec41772dcdebc57f
Winson Chung [Fri, 28 Apr 2017 00:58:18 +0000 (00:58 +0000)]
Merge "Only sublist array by size or limit, whichever is smaller." into oc-dev
Seigo Nonaka [Fri, 28 Apr 2017 00:50:39 +0000 (00:50 +0000)]
Merge "Remove FontsContract.buildTypeface with weight/italic argument." into oc-dev
am:
2b6bf2f221
Change-Id: I8da2c3c357be33e07733072a5e638a103014190b
Joe Onorato [Fri, 28 Apr 2017 00:44:01 +0000 (00:44 +0000)]
Merge "Turn off log spew, and make it use Slog.w instead of e.printStackTrace" into oc-dev
am:
f516251453
Change-Id: I9ec51f68442b2352f98238e70641b041dd94725b
Suprabh Shukla [Fri, 28 Apr 2017 00:41:55 +0000 (00:41 +0000)]
Merge "Fixing service notification on secondary users" into oc-dev
am:
c1aaede528
Change-Id: I74d90a707ab3cb7ced185995caed9fa6c0a17f28
TreeHugger Robot [Fri, 28 Apr 2017 00:41:21 +0000 (00:41 +0000)]
Merge "Expose missing accessibility settings to instant apps" into oc-dev
Julia Reynolds [Fri, 28 Apr 2017 00:39:35 +0000 (00:39 +0000)]
Merge "Change snoozing behavior for notifications in groups" into oc-dev
am:
ad9412cf8a
Change-Id: I548d7e648de5ea8ec8234418d1c06f47f4e40697
Winson Chung [Fri, 28 Apr 2017 00:38:13 +0000 (17:38 -0700)]
Only sublist array by size or limit, whichever is smaller.
Bug:
37756537
Test: Set < 3 actions, ensure no crash...
Change-Id: I93a5ac78292fcdd870ebd897441c2cef0774d134
Jakub Pawlowski [Fri, 28 Apr 2017 00:36:03 +0000 (00:36 +0000)]
Merge changes from topic 'bt5-cherry-pickerry-3' into oc-dev
am:
9a4b756c9b
Change-Id: I3b18c86a3981db316369a11d91a9334a38205151
Mathias Agopian [Fri, 28 Apr 2017 00:29:28 +0000 (00:29 +0000)]
Merge "Plumb gralloc producer/consumer bits correctly" into oc-dev
Selim Cinek [Fri, 28 Apr 2017 00:24:49 +0000 (00:24 +0000)]
Merge changes from topic 'music_extraction' into oc-dev
* changes:
Make music notifications not dimmable
Implementing gradual image fade for the media template
Extracting the notification colors based on the album art
Moved notification builder creation to the background
Mathias Agopian [Thu, 20 Apr 2017 23:36:15 +0000 (16:36 -0700)]
Plumb gralloc producer/consumer bits correctly
Bug:
33350696
Test: compile, boot device, its
Change-Id: I6129cedce0b35acfef1702afdd178ba043dd53cb
TreeHugger Robot [Fri, 28 Apr 2017 00:04:07 +0000 (00:04 +0000)]
Merge "Bluetooth: Add constants to ScanResult" into oc-dev
TreeHugger Robot [Thu, 27 Apr 2017 23:57:38 +0000 (23:57 +0000)]
Merge "Remove reference to removed string" into oc-dev
Erik Wolsheimer [Thu, 27 Apr 2017 23:53:52 +0000 (23:53 +0000)]
Add logging around dream start/stop am:
4769b54d49 am:
b50a0cdd5e
am:
d34305c2af
Change-Id: Ib7c815cd0bc06f31eace7dd4147feb17d9c1a57a
Android Build Merger (Role) [Thu, 27 Apr 2017 23:52:53 +0000 (23:52 +0000)]
Merge "Add logging around dream start/stop am:
4769b54d49 am:
b50a0cdd5e" into oc-dev
Erik Wolsheimer [Thu, 27 Apr 2017 23:51:45 +0000 (23:51 +0000)]
Add logging around dream start/stop am:
4769b54d49
am:
b50a0cdd5e
Change-Id: I0db4f7ff4c7782e71ff7a4e7528776462132d3ed
TreeHugger Robot [Thu, 27 Apr 2017 23:51:28 +0000 (23:51 +0000)]
Merge "add 'changes' cmd to dumpsys" into oc-dev
Erik Wolsheimer [Thu, 27 Apr 2017 23:48:51 +0000 (23:48 +0000)]
Add logging around dream start/stop am:
4769b54d49
am:
b50a0cdd5e
Change-Id: I8b658faa9eac7c448c0e37cc81d93775ecb4c8d7
TreeHugger Robot [Thu, 27 Apr 2017 23:45:38 +0000 (23:45 +0000)]
Merge "AAPT2: Add workaround for non-standard package IDs" into oc-dev
Adam Powell [Thu, 27 Apr 2017 23:45:22 +0000 (23:45 +0000)]
Merge "Address API feedback for new fragment APIs" into oc-dev
am:
13d03e504d
Change-Id: Ia68a03aff0ad012a80ff23f60708856dbe795b16
Erik Wolsheimer [Thu, 27 Apr 2017 23:43:19 +0000 (23:43 +0000)]
Add logging around dream start/stop
am:
4769b54d49
Change-Id: If77de68a0c775b32b6df7e95462f698efc2f84ee
Derek Sollenberger [Thu, 27 Apr 2017 23:41:25 +0000 (23:41 +0000)]
Merge "Disable Vulkan backend when running hwui_unit_tests." into oc-dev
am:
f9dc09f4ea
Change-Id: I613b0f380995d88bbda6c916af68b96ab69e8dff
Sujith Ramakrishnan [Thu, 27 Apr 2017 23:39:25 +0000 (23:39 +0000)]
Merge "Updated intent action name to comply with CTS." into oc-dev
am:
b4f21f0482
Change-Id: Ica8d3565560993dc100ccfb20adf8028f807d44f
TreeHugger Robot [Thu, 27 Apr 2017 23:38:22 +0000 (23:38 +0000)]
Merge "Throttle wifi scan requests from background apps (1/2)." into oc-dev
Chris Tate [Thu, 27 Apr 2017 23:37:23 +0000 (23:37 +0000)]
Merge "Fix 'jobscheduler run' shell command" into oc-dev
am:
cfdc7eb87c
Change-Id: Ida9bc04031e043311fa8c5bd6b3bbb75eb64106c
Lucas Dupin [Thu, 27 Apr 2017 23:35:01 +0000 (23:35 +0000)]
Merge "DO NOT MERGE Revert "Wallpaper color extraction API stub"" into oc-dev
am:
a851b5ae76
Change-Id: I6ccf0d0c1cefa9e16b68071bb7d98586fc54d9ad
fionaxu [Thu, 27 Apr 2017 23:29:44 +0000 (23:29 +0000)]
Merge "new reset carrier signals/actions" into oc-dev
am:
b71f3ca3f0
Change-Id: Icb549f9a80e761b00a129f9fcab8934130fd0417
Evan Rosky [Thu, 27 Apr 2017 23:27:38 +0000 (23:27 +0000)]
Merge "Only restrict arrows out of text fields from keyboard" into oc-dev
am:
d0c6cf9bc0
Change-Id: Ia470d8ece930a53a54976620b2fe6711a107e652
Dmitry Dementyev [Thu, 27 Apr 2017 23:25:28 +0000 (23:25 +0000)]
Merge "Use invalid package names for special keys in AccountManager." into oc-dev
am:
e669ae438f
Change-Id: I41c726829585b3628125b17548428b3cc4f3a06e
TreeHugger Robot [Thu, 27 Apr 2017 23:17:06 +0000 (23:17 +0000)]
Merge "Remove FontsContract.buildTypeface with weight/italic argument." into oc-dev
Joe Onorato [Thu, 27 Apr 2017 23:15:09 +0000 (23:15 +0000)]
Merge "Turn off log spew, and make it use Slog.w instead of e.printStackTrace" into oc-dev
Android Build Merger (Role) [Thu, 27 Apr 2017 23:13:27 +0000 (23:13 +0000)]
Merge "Merge "new reset carrier signals/actions" am:
5bd39aaf42 am:
dc31a45517 am:
89b525afb3" into oc-dev-plus-aosp
fionaxu [Thu, 27 Apr 2017 23:12:12 +0000 (23:12 +0000)]
Merge "new reset carrier signals/actions" am:
5bd39aaf42 am:
dc31a45517
am:
89b525afb3
Change-Id: Idcdfb7667b0db7b403bab38bcc24201a8eafe4ca
Jorim Jaggi [Thu, 27 Apr 2017 23:09:09 +0000 (23:09 +0000)]
Merge "Implement API council feedback for dismissKeyguard" into oc-dev
am:
560324cfa0
Change-Id: I268c6e571d18aea91de4d6e7b29e0fa23f0c1885
TreeHugger Robot [Thu, 27 Apr 2017 23:02:31 +0000 (23:02 +0000)]
Merge "Fixing service notification on secondary users" into oc-dev
fionaxu [Thu, 27 Apr 2017 23:02:23 +0000 (23:02 +0000)]
Merge "new reset carrier signals/actions" am:
5bd39aaf42
am:
dc31a45517
Change-Id: I59b456a4e849900080cc0564b096e6dacf7070ae
Sudheer Shanka [Thu, 27 Apr 2017 23:01:09 +0000 (23:01 +0000)]
Merge "Rename ActivityMonitor.onMatchIntent to onStartActivity." into oc-dev
am:
7e7f7d526d
Change-Id: I58ef3598a912d72ba0a67311b8c5b11c30287f5b
fionaxu [Thu, 27 Apr 2017 22:57:30 +0000 (22:57 +0000)]
Merge "new reset carrier signals/actions"
am:
5bd39aaf42
Change-Id: I503cd2c7d7ca63d9668995319d4876a39fc91666
TreeHugger Robot [Thu, 27 Apr 2017 22:56:03 +0000 (22:56 +0000)]
Merge "Change snoozing behavior for notifications in groups" into oc-dev
Jakub Pawlowski [Thu, 27 Apr 2017 22:55:06 +0000 (22:55 +0000)]
Merge "Merge "Bluetooth: Add constants to ScanResult" am:
369a94496c" into stage-aosp-master am:
c6c9508f8a
am:
90e8cc8f26
Change-Id: I7bda67787c3d874f7016ae3aa7e4563a03f38c0c
Jakub Pawlowski [Thu, 27 Apr 2017 22:52:34 +0000 (22:52 +0000)]
Merge "Bluetooth: Add constants to ScanResult" am:
369a94496c am:
b6656f07e7
am:
493ae0da60
Change-Id: Ib7c7f3f71e6e49d06091effb99ac09dae605822e
Android Build Merger (Role) [Thu, 27 Apr 2017 22:50:57 +0000 (22:50 +0000)]
Merge "Merge "Don't call adjustFocusedActivityStackLocked on finished activity." into oc-dev am:
d08c064976" into oc-dev-plus-aosp
Treehugger Robot [Thu, 27 Apr 2017 22:48:07 +0000 (22:48 +0000)]
Merge "new reset carrier signals/actions"
Bryce Lee [Thu, 27 Apr 2017 22:46:52 +0000 (22:46 +0000)]
Merge "Don't call adjustFocusedActivityStackLocked on finished activity." into oc-dev
am:
d08c064976
Change-Id: I16b6bd1905880f96b6a2d47915556b9775a3689a
Jakub Pawlowski [Thu, 27 Apr 2017 22:42:18 +0000 (22:42 +0000)]
Merge "Merge "Bluetooth: Add constants to ScanResult" am:
369a94496c" into stage-aosp-master
am:
c6c9508f8a
Change-Id: I8876af2e00e6a52629a47c1ef7c26f4c674e5de8
Android Build Merger (Role) [Thu, 27 Apr 2017 22:38:39 +0000 (22:38 +0000)]
Merge "Merge "Bluetooth: Add constants to ScanResult" am:
369a94496c" into stage-aosp-master
OSDN Git Service
