OSDN Git Service
Phil Weaver [Tue, 25 Apr 2017 19:22:05 +0000 (19:22 +0000)]
Merge "Allow a11y listeners to specify handlers" into oc-dev am:
efb859f2af
am:
7aa63724c8 -s ours
Change-Id: I83b3c2dc9356af30c8b01d122c1e598cad663d71
TreeHugger Robot [Tue, 25 Apr 2017 19:06:47 +0000 (19:06 +0000)]
Merge "Reorder USB_STATE updates so config_changed is not replaced."
TreeHugger Robot [Tue, 25 Apr 2017 19:03:04 +0000 (19:03 +0000)]
Merge "Create a metrics events for ag/
2085657 (DO disclosure screens)"
Adrian Roos [Tue, 25 Apr 2017 18:54:16 +0000 (18:54 +0000)]
Merge "Perf: Fix RemoteViews memory leak" into oc-dev am:
4554332475
am:
f277953d83
Change-Id: I83dc18991a8e29ea70cb152c850f60f78b66006b
Jorim Jaggi [Tue, 25 Apr 2017 18:52:24 +0000 (18:52 +0000)]
Merge "Add tracing for onTaskStackChanged" into oc-dev am:
f217fc0eff
am:
400e29c8a9
Change-Id: I3b619d7c6983679fc6ddf9481b2b63a1326d801d
TreeHugger Robot [Tue, 25 Apr 2017 18:49:21 +0000 (18:49 +0000)]
Merge "resolve merge conflicts of
a2b0b7381c7e to master"
TreeHugger Robot [Tue, 25 Apr 2017 18:10:48 +0000 (18:10 +0000)]
Merge "Move common tar reading parts to separate class."
Phil Weaver [Tue, 25 Apr 2017 17:26:41 +0000 (17:26 +0000)]
Merge "Allow a11y listeners to specify handlers" into oc-dev
am:
efb859f2af
Change-Id: Ifcee49e39f57d5991c15ebf7a2fa4f0fa3a53edf
Phil Weaver [Tue, 25 Apr 2017 17:17:58 +0000 (17:17 +0000)]
Merge "Allow a11y listeners to specify handlers" into oc-dev
Jason Monk [Tue, 25 Apr 2017 17:16:45 +0000 (13:16 -0400)]
resolve merge conflicts of
a2b0b7381c7e to master
Test: I solemnly swear I tested this conflict resolution.
Change-Id: I85595d8c5b4bd8d09db96115f88e78c215776eb3
Adrian Roos [Tue, 25 Apr 2017 17:15:38 +0000 (17:15 +0000)]
Merge "Perf: Fix RemoteViews memory leak" into oc-dev
am:
4554332475
Change-Id: I6f61ecea304c12ef965ad1ed2734c45dc4cee91d
Jorim Jaggi [Tue, 25 Apr 2017 17:12:08 +0000 (17:12 +0000)]
Merge "Add tracing for onTaskStackChanged" into oc-dev
am:
f217fc0eff
Change-Id: I81db6d37d9c7a635b33353f0c98790029cb7de14
Adrian Roos [Tue, 25 Apr 2017 17:09:19 +0000 (17:09 +0000)]
Merge "Perf: Fix RemoteViews memory leak" into oc-dev
Pankaj Kanwar [Tue, 25 Apr 2017 17:05:16 +0000 (17:05 +0000)]
Merge "Provide an API to make USSD calls and read the responses." am:
41f48e3f18 am:
d6465983f1 am:
df2d829272 -s ours
am:
8c4cd989ae
Change-Id: I3d6add78d2394532ef504d828028ca5ac34d60f1
Jason Monk [Tue, 25 Apr 2017 17:03:59 +0000 (17:03 +0000)]
Merge "Fix crash in plugin settings" into oc-dev
am:
133eb460bd
Change-Id: I60b8fb3a05b46fef7375dd9dddafc5137f0624b0
TreeHugger Robot [Tue, 25 Apr 2017 17:01:42 +0000 (17:01 +0000)]
Merge "Add tracing for onTaskStackChanged" into oc-dev
Juan Lang [Tue, 25 Apr 2017 17:00:38 +0000 (17:00 +0000)]
Merge changes I3d96f55a,I581c100b,I5c424160
* changes:
Count and log the number of consecutive rapid power button presses.
Add tests for MetricsLogger events.
Add unit tests for power button-related pieces of the GestureLauncherService.
Pankaj Kanwar [Tue, 25 Apr 2017 16:58:46 +0000 (16:58 +0000)]
Merge "Provide an API to make USSD calls and read the responses." am:
41f48e3f18 am:
d6465983f1
am:
df2d829272 -s ours
Change-Id: I473b82e8a664634c84ad97e409254addee2b8d60
Jason Monk [Tue, 25 Apr 2017 16:56:32 +0000 (16:56 +0000)]
Merge "Fix crash in plugin settings" into oc-dev
Tomasz Wasilczyk [Tue, 25 Apr 2017 16:55:26 +0000 (16:55 +0000)]
Merge "Fix BandConfig parcelable deserialization to properly interpret subclass data."
Antony Sargent [Tue, 25 Apr 2017 16:45:03 +0000 (16:45 +0000)]
Merge "Strings for "Use high quality audio" option in Bluetooth A2DP device settings" into oc-dev am:
3036e728e7
am:
8288594294
Change-Id: I6ae9f188bd2c25ccf3f6a0e8753e9b5e29b116ab
Antony Sargent [Tue, 25 Apr 2017 16:38:35 +0000 (16:38 +0000)]
Merge "Strings for "Use high quality audio" option in Bluetooth A2DP device settings" into oc-dev
am:
3036e728e7
Change-Id: I409d7902c2dcb20bf5b31c3bc0c4719adcee6596
Antony Sargent [Tue, 25 Apr 2017 16:30:54 +0000 (16:30 +0000)]
Merge "Strings for "Use high quality audio" option in Bluetooth A2DP device settings" into oc-dev
Pankaj Kanwar [Tue, 25 Apr 2017 16:20:51 +0000 (16:20 +0000)]
Merge "Provide an API to make USSD calls and read the responses." am:
41f48e3f18
am:
d6465983f1
Change-Id: I0660aab378b2deee3f52e710a0a413b806dd0792
Gustav Sennton [Tue, 25 Apr 2017 16:16:34 +0000 (16:16 +0000)]
Merge "Explicitly wait for the WebView Zygote." into oc-dev am:
3202c10207
am:
60237ac50f
Change-Id: Ia6a54e429a38a444c7f4954963b4391a736a3f70
Artem Iglikov [Tue, 25 Apr 2017 13:48:05 +0000 (14:48 +0100)]
Move common tar reading parts to separate class.
This moves part of the common code for reading tar files from
PerformAdbRestoreTask and FullRestoreEngine to it's own class.
Change is mostly automated, but with some manual intervention which
doesn't change behaviour.
Bug:
37519282
Test: cts,gts,pts
Change-Id: I669b848e16196ae76fb9e820b786bbe248985e47
Pankaj Kanwar [Tue, 25 Apr 2017 16:14:14 +0000 (16:14 +0000)]
Merge "Provide an API to make USSD calls and read the responses."
am:
41f48e3f18
Change-Id: Ia3244783e5df300ae6f8a4ad553e15e7e72f7965
Gustav Sennton [Tue, 25 Apr 2017 16:10:33 +0000 (16:10 +0000)]
Merge "Explicitly wait for the WebView Zygote." into oc-dev
am:
3202c10207
Change-Id: I86b040d6ebb0ab8255351c27d92b7d2a818ed60a
Pankaj Kanwar [Tue, 25 Apr 2017 16:08:25 +0000 (16:08 +0000)]
Merge "Provide an API to make USSD calls and read the responses."
Gustav Sennton [Tue, 25 Apr 2017 16:05:53 +0000 (16:05 +0000)]
Merge "Explicitly wait for the WebView Zygote." into oc-dev
Jean-Michel Trivi [Tue, 25 Apr 2017 15:51:51 +0000 (15:51 +0000)]
Merge "VolumeShaper: API change for duration" into oc-dev am:
44515357ce
am:
d4561d4a90
Change-Id: Ieac8c4ff551537534eec88076d92557b90a052d9
Adam Lesinski [Tue, 25 Apr 2017 15:43:15 +0000 (15:43 +0000)]
Merge "AAPT2: Add better error message when processing invalid files" into oc-dev am:
b9dbee430d
am:
56ee63d777
Change-Id: I87e0bf3432a0e8e7a41655eba6aa6abf1c6ec451
Jean-Michel Trivi [Tue, 25 Apr 2017 15:42:21 +0000 (15:42 +0000)]
Merge "VolumeShaper: API change for duration" into oc-dev
am:
44515357ce
Change-Id: I9bbf338a3c3170bd2304637a197c643c8da0a00f
Adam Lesinski [Tue, 25 Apr 2017 15:37:36 +0000 (15:37 +0000)]
Merge "AAPT2: Allow <path-permission> tag in <provider>" into oc-dev am:
7beb895d75
am:
706b85e855
Change-Id: I7ae22f1f7dd0736ca83261bc6efae5543c560c59
Jean-Michel Trivi [Tue, 25 Apr 2017 15:36:33 +0000 (15:36 +0000)]
Merge "VolumeShaper: API change for duration" into oc-dev
Adam Lesinski [Tue, 25 Apr 2017 15:33:01 +0000 (15:33 +0000)]
Merge "AAPT2: Add better error message when processing invalid files" into oc-dev
am:
b9dbee430d
Change-Id: I64df2268e9dbc80fe4630c068ad8ee58ced5765e
Adam Lesinski [Tue, 25 Apr 2017 15:30:55 +0000 (15:30 +0000)]
Merge "AAPT2: Allow <path-permission> tag in <provider>" into oc-dev
am:
7beb895d75
Change-Id: I7c426e4e8eb6187d044069c577ae68b1af41ea1e
TreeHugger Robot [Tue, 25 Apr 2017 15:26:20 +0000 (15:26 +0000)]
Merge "AAPT2: Add better error message when processing invalid files" into oc-dev
TreeHugger Robot [Tue, 25 Apr 2017 15:25:57 +0000 (15:25 +0000)]
Merge "AAPT2: Allow <path-permission> tag in <provider>" into oc-dev
Denis Kuznetsov [Thu, 13 Apr 2017 09:41:33 +0000 (11:41 +0200)]
Create a metrics events for ag/
2085657 (DO disclosure screens)
Bug:
32692748
Test: Tests for functional changes are in ag/
2085657
Change-Id: I6988a950ab2aa78dcb3f848b59a5b0905da7b204
Jorim Jaggi [Mon, 24 Apr 2017 16:34:55 +0000 (18:34 +0200)]
Add tracing for onTaskStackChanged
Test: Capture trace
Bug:
37550083
Change-Id: Iee302b189768419fe8a55d041ce65e861ef3c1f1
Rubin Xu [Tue, 25 Apr 2017 13:54:17 +0000 (13:54 +0000)]
Merge "Introduce KEYSTORE_FLAG_CRITICAL_TO_DEVICE_ENCRYPTION" into oc-dev am:
4f86a894e1
am:
59c65a8a84
Change-Id: Ibb6f52de3195a636025a58989bb6566b274a8ad6
Geoffrey Pitsch [Tue, 25 Apr 2017 13:50:40 +0000 (13:50 +0000)]
Merge "Further bulletproof NotificationInfo's public api from exceptions" into oc-dev am:
390cdab47c
am:
442a4e4c91
Change-Id: I9de7dc27370a73da838c7c5540faa6542e4a9432
Rubin Xu [Tue, 25 Apr 2017 13:50:10 +0000 (13:50 +0000)]
Merge "Introduce KEYSTORE_FLAG_CRITICAL_TO_DEVICE_ENCRYPTION" into oc-dev
am:
4f86a894e1
Change-Id: I0947dbaa1eb840bffd7299d9fe8a9f6aea118a47
Etan Cohen [Tue, 25 Apr 2017 13:46:42 +0000 (13:46 +0000)]
Merge "[AWARE] Add UID checking to WifiAwareNetworkSpecifier" am:
2fd19ffa06 am:
3c6305cc55 am:
887fd90742
am:
79d9e99632
Change-Id: I4ef57924507633315ed0dbd5f18abbd9138de572
Geoffrey Pitsch [Tue, 25 Apr 2017 13:45:05 +0000 (13:45 +0000)]
Merge "Further bulletproof NotificationInfo's public api from exceptions" into oc-dev
am:
390cdab47c
Change-Id: I422d6b7627378a949c4fbe53098edb0fef1b3050
TreeHugger Robot [Tue, 25 Apr 2017 13:42:38 +0000 (13:42 +0000)]
Merge "Introduce KEYSTORE_FLAG_CRITICAL_TO_DEVICE_ENCRYPTION" into oc-dev
Etan Cohen [Tue, 25 Apr 2017 13:40:42 +0000 (13:40 +0000)]
Merge "[AWARE] Add UID checking to WifiAwareNetworkSpecifier" am:
2fd19ffa06 am:
3c6305cc55
am:
887fd90742
Change-Id: I8480ac43d89dc85b541e6255c3cdc597393896cf
Geoffrey Pitsch [Tue, 25 Apr 2017 13:38:45 +0000 (13:38 +0000)]
Merge "Further bulletproof NotificationInfo's public api from exceptions" into oc-dev
Etan Cohen [Tue, 25 Apr 2017 13:34:06 +0000 (13:34 +0000)]
Merge "[AWARE] Add UID checking to WifiAwareNetworkSpecifier" am:
2fd19ffa06
am:
3c6305cc55
Change-Id: I4e2461f68db983292c167a11746b8cfe47995e77
Etan Cohen [Tue, 25 Apr 2017 13:27:22 +0000 (13:27 +0000)]
Merge "[AWARE] Add UID checking to WifiAwareNetworkSpecifier"
am:
2fd19ffa06
Change-Id: I8e4a38b113d6e8f81bc382715dda5c279771e454
Etan Cohen [Tue, 25 Apr 2017 13:21:35 +0000 (13:21 +0000)]
Merge "[AWARE] Add UID checking to WifiAwareNetworkSpecifier"
Rubin Xu [Tue, 25 Apr 2017 12:23:17 +0000 (12:23 +0000)]
Merge "Add param javadoc to DevicePolicyManager.setBackupServiceEnabled" into oc-dev am:
a31f49a0df
am:
e45651ba8f
Change-Id: I2c4e924c5e6a3317aca31ca56676e73e641e261e
Rubin Xu [Tue, 25 Apr 2017 12:17:13 +0000 (12:17 +0000)]
Merge "Add param javadoc to DevicePolicyManager.setBackupServiceEnabled" into oc-dev
am:
a31f49a0df
Change-Id: I366df8ae5c7d8af35e47554f095fc927b64f62fb
Rubin Xu [Tue, 25 Apr 2017 12:13:16 +0000 (12:13 +0000)]
Merge "Clarify time unit for StrongAuthTimeout APIs" into oc-dev am:
2c20a6db28
am:
0a555a6595
Change-Id: I6e22acaa9a183f97874f75ba71dc9ca1434ff60e
TreeHugger Robot [Tue, 25 Apr 2017 12:11:10 +0000 (12:11 +0000)]
Merge "Add param javadoc to DevicePolicyManager.setBackupServiceEnabled" into oc-dev
Rubin Xu [Tue, 25 Apr 2017 12:07:18 +0000 (12:07 +0000)]
Merge "Clarify time unit for StrongAuthTimeout APIs" into oc-dev
am:
2c20a6db28
Change-Id: I42086661a5f3969e117e1c07876e48da1392c08e
TreeHugger Robot [Tue, 25 Apr 2017 12:02:02 +0000 (12:02 +0000)]
Merge "Clarify time unit for StrongAuthTimeout APIs" into oc-dev
Fan Zhang [Tue, 25 Apr 2017 10:05:13 +0000 (10:05 +0000)]
Merge "Set icon frame to invisible when iconSpaceReserved is set." into oc-dev am:
544cf7793f
am:
17b995d042
Change-Id: I9300448d8a60399e839dbf20bb5fea5afd7b291b
Fan Zhang [Tue, 25 Apr 2017 09:59:10 +0000 (09:59 +0000)]
Merge "Set icon frame to invisible when iconSpaceReserved is set." into oc-dev
am:
544cf7793f
Change-Id: Ia03f596609c963f00bdf0f33c228e2c120a09baa
TreeHugger Robot [Tue, 25 Apr 2017 09:52:52 +0000 (09:52 +0000)]
Merge "Set icon frame to invisible when iconSpaceReserved is set." into oc-dev
Felipe Leme [Tue, 25 Apr 2017 09:11:04 +0000 (09:11 +0000)]
Merge "Added APIs that let AutofillService implementations set themselves as such." into oc-dev am:
fc513f98d7
am:
535422c80b
Change-Id: I978f429f100af65df6483364a90e29fc26ae0379
Felipe Leme [Tue, 25 Apr 2017 09:02:25 +0000 (09:02 +0000)]
Merge "Added APIs that let AutofillService implementations set themselves as such." into oc-dev
am:
fc513f98d7
Change-Id: I2c947e9dd500ecd8a1573a1ea288ce6b2fbddf6c
TreeHugger Robot [Tue, 25 Apr 2017 08:55:57 +0000 (08:55 +0000)]
Merge "Added APIs that let AutofillService implementations set themselves as such." into oc-dev
Hugo Benichi [Tue, 25 Apr 2017 08:09:32 +0000 (08:09 +0000)]
Merge "NetworkCapabilities: remove duplicated TRANSPORT_NAMES" into oc-dev-plus-aosp
am:
c3d2f25a5d
Change-Id: I1e039236d7d4eda6354c81440fbbc43346376f23
Hugo Benichi [Tue, 25 Apr 2017 08:03:52 +0000 (08:03 +0000)]
Merge "NetworkCapabilities: remove duplicated TRANSPORT_NAMES" into oc-dev-plus-aosp
Philip Cuadra [Tue, 25 Apr 2017 07:53:30 +0000 (07:53 +0000)]
Merge "Allow Bluetooth CAP_SYS_NICE, set RT priority for Bluetooth HAL" into oc-dev am:
6ccc29bba5
am:
d6cf20fad6
Change-Id: I96f462f042acb8b26234e2d1fc5bbef0eb6a8fa9
Philip P. Moltmann [Tue, 25 Apr 2017 07:45:46 +0000 (07:45 +0000)]
Merge "Take new autofill structure for each partition" into oc-dev am:
f40d1cb773
am:
5a3ac07443
Change-Id: I425fcac1d41c82c3ba30144c899ced64def472f2
Philip Cuadra [Tue, 25 Apr 2017 07:44:41 +0000 (07:44 +0000)]
Merge "Allow Bluetooth CAP_SYS_NICE, set RT priority for Bluetooth HAL" into oc-dev
am:
6ccc29bba5
Change-Id: I34226849c549621713e4c409bb9449cbc0d79456
Philip P. Moltmann [Tue, 25 Apr 2017 07:39:21 +0000 (07:39 +0000)]
Merge "Take new autofill structure for each partition" into oc-dev
am:
f40d1cb773
Change-Id: I0da0d98bb03d5a1d6156950e9f557115f232c3fb
TreeHugger Robot [Tue, 25 Apr 2017 07:38:40 +0000 (07:38 +0000)]
Merge "Allow Bluetooth CAP_SYS_NICE, set RT priority for Bluetooth HAL" into oc-dev
TreeHugger Robot [Tue, 25 Apr 2017 07:31:24 +0000 (07:31 +0000)]
Merge "Take new autofill structure for each partition" into oc-dev
Hugo Benichi [Tue, 25 Apr 2017 07:28:28 +0000 (16:28 +0900)]
NetworkCapabilities: remove duplicated TRANSPORT_NAMES
Due to multi-branch automerging issue, TRANSPORT_NAMES got inserted
twice into NetworkCapabilities both by commits
a365bace7a8e and
9910dbc68211. This patch deletes one of the copy.
Test: no functionality change. Build is fixed.
Change-Id: I2adec1a9cb1ee6f1d61dfeec2d0b92b8141eed88
Eugene Susla [Tue, 25 Apr 2017 06:54:10 +0000 (06:54 +0000)]
Merge "Add javadoc about APIs requiring uses-feature" into oc-dev am:
07d2cec982
am:
0cc9c8090d
Change-Id: I2b763f91adfc6f6dc25915f6a41efffdcc44ea42
Eugene Susla [Tue, 25 Apr 2017 06:52:53 +0000 (06:52 +0000)]
Merge "Check for uses-feature in Companion APIs" into oc-dev am:
7575fa7600
am:
0f88845e56
Change-Id: Ib5272433ce9af4356eb57c50235b488e3f2e2d5a
Eugene Susla [Tue, 25 Apr 2017 06:47:42 +0000 (06:47 +0000)]
Merge "Add javadoc about APIs requiring uses-feature" into oc-dev
am:
07d2cec982
Change-Id: Id9c9ebd126f0fc289c07515455833ec970aff271
Eugene Susla [Tue, 25 Apr 2017 06:46:24 +0000 (06:46 +0000)]
Merge "Check for uses-feature in Companion APIs" into oc-dev
am:
7575fa7600
Change-Id: I99ca8f54d480a8a297a8e82d7c0883a628541b89
TreeHugger Robot [Tue, 25 Apr 2017 06:42:02 +0000 (06:42 +0000)]
Merge "Add javadoc about APIs requiring uses-feature" into oc-dev
TreeHugger Robot [Tue, 25 Apr 2017 06:42:02 +0000 (06:42 +0000)]
Merge "Check for uses-feature in Companion APIs" into oc-dev
Wale Ogunwale [Tue, 25 Apr 2017 06:15:30 +0000 (06:15 +0000)]
Merge "Continue to @hide freeform decor caption APIs" into oc-dev am:
302ba2d3ab
am:
8f8c43bde8
Change-Id: Ied400c025038549532913a5f9d4ccd8573da5a4f
Wale Ogunwale [Tue, 25 Apr 2017 06:09:25 +0000 (06:09 +0000)]
Merge "Continue to @hide freeform decor caption APIs" into oc-dev
am:
302ba2d3ab
Change-Id: I98135d6354a269669e176d9f4dee5b825578ff22
TreeHugger Robot [Tue, 25 Apr 2017 06:03:07 +0000 (06:03 +0000)]
Merge "Continue to @hide freeform decor caption APIs" into oc-dev
Winson Chung [Tue, 25 Apr 2017 05:44:24 +0000 (05:44 +0000)]
Merge "Move RecentsImpl task stack listener to background." into oc-dev am:
024f80ca82
am:
6120510e8e
Change-Id: I15dd5d31070a701b99e960787d14f0da7bf4d05b
Winson Chung [Tue, 25 Apr 2017 05:38:51 +0000 (05:38 +0000)]
Merge "Move RecentsImpl task stack listener to background." into oc-dev
am:
024f80ca82
Change-Id: I8d40752e96a1ea30267acad7be0db02905e28e8c
TreeHugger Robot [Tue, 25 Apr 2017 05:33:01 +0000 (05:33 +0000)]
Merge "Move RecentsImpl task stack listener to background." into oc-dev
Felipe Leme [Tue, 25 Apr 2017 05:28:21 +0000 (05:28 +0000)]
Merge "Hide deprecated APIs." into oc-dev am:
59fe3108fa
am:
4e71ae1243
Change-Id: Ib15e77c4ad3915ed41837584e587c2abbc6657de
Nathan Harold [Tue, 25 Apr 2017 05:21:39 +0000 (05:21 +0000)]
Merge "Remove the docstring dependency on telephony-common" into oc-dev am:
b06ff6f256
am:
49d4e5e413
Change-Id: Iabd238e291c882db18b4bca2171b7c9b5bcff9d2
Felipe Leme [Tue, 25 Apr 2017 05:15:43 +0000 (05:15 +0000)]
Merge "Hide deprecated APIs." into oc-dev
am:
59fe3108fa
Change-Id: Ib7effcaade703c76e13272f030922233061d3efd
Nathan Harold [Tue, 25 Apr 2017 05:13:24 +0000 (05:13 +0000)]
Merge "Remove the docstring dependency on telephony-common" into oc-dev
am:
b06ff6f256
Change-Id: I62bf5f96f48b4e16e48055b490b4da92096f133e
TreeHugger Robot [Tue, 25 Apr 2017 05:09:23 +0000 (05:09 +0000)]
Merge "Hide deprecated APIs." into oc-dev
TreeHugger Robot [Tue, 25 Apr 2017 05:05:35 +0000 (05:05 +0000)]
Merge "Remove the docstring dependency on telephony-common" into oc-dev
Fan Zhang [Tue, 25 Apr 2017 05:01:50 +0000 (05:01 +0000)]
Merge "Fix SettingsDrawerActivityTest on fugu." into oc-dev am:
940f6a9962
am:
bb6f84699e
Change-Id: I74de73282d33260ea99e240fcf904c1ab39361dc
Todd Kennedy [Tue, 25 Apr 2017 04:57:10 +0000 (04:57 +0000)]
Merge "fix check for provider resolution" into oc-dev am:
ade1496f96
am:
3627c9479a
Change-Id: I01241d8f5c5e13be273a5187502267c633e5fd9c
Fan Zhang [Tue, 25 Apr 2017 04:55:45 +0000 (04:55 +0000)]
Merge "Fix SettingsDrawerActivityTest on fugu." into oc-dev
am:
940f6a9962
Change-Id: I6346e51b77e03eca1c7496ce9fa3ed41c7de2a04
Todd Kennedy [Tue, 25 Apr 2017 04:48:26 +0000 (04:48 +0000)]
Merge "fix check for provider resolution" into oc-dev
am:
ade1496f96
Change-Id: Iced763d26e0872d3b6cc5a124e95c413ad7fc436
Fan Zhang [Tue, 25 Apr 2017 04:48:19 +0000 (04:48 +0000)]
Merge "Fix SettingsDrawerActivityTest on fugu." into oc-dev
TreeHugger Robot [Tue, 25 Apr 2017 04:44:51 +0000 (04:44 +0000)]
Merge "fix check for provider resolution" into oc-dev
lei.xa.liu [Tue, 25 Apr 2017 04:42:12 +0000 (04:42 +0000)]
Merge "Remove redundant lockscreen shown check" into oc-dev am:
90c3489525
am:
9af8f27ef9
Change-Id: I510e2df0d5f55df6f2f3864273fec2b07844ba45
Wale Ogunwale [Tue, 25 Apr 2017 04:37:21 +0000 (04:37 +0000)]
Merge "Don't specify stack bounds for unsizeable home stack in dock mode" into oc-dev am:
f4472b6507
am:
a805e2cc22
Change-Id: Ie36d9fd65d934f270c7f648bb37b42a7d93a8739
lei.xa.liu [Tue, 25 Apr 2017 04:33:15 +0000 (04:33 +0000)]
Merge "Remove redundant lockscreen shown check" into oc-dev
am:
90c3489525
Change-Id: I77f82bcd38a0cb16226d58a5731c76a630c7e3be
OSDN Git Service
