OSDN Git Service
Oleksiy Avramchenko [Tue, 2 May 2017 15:45:25 +0000 (15:45 +0000)]
Merge "Force a light to be set for the first time" am:
e6ad7a6704 am:
96a8556990 am:
db877fa31c
am:
f12993a715
Change-Id: I3b4ef0bd22da42883c4ae76640343ec4484e7e2d
Android Build Merger (Role) [Tue, 2 May 2017 15:32:10 +0000 (15:32 +0000)]
TreeHugger Robot [Tue, 2 May 2017 15:31:16 +0000 (15:31 +0000)]
Merge "Import translations. DO NOT MERGE"
Narayan Kamath [Tue, 2 May 2017 15:31:06 +0000 (15:31 +0000)]
Merge "Track libcore change
03e8c7dca78a95ccf719a7." am:
194f8471fd am:
f06800c3ff am:
58508dfd6e
am:
2c9fc6f6b7
Change-Id: I5af6e30af6478d070767fee87bc185f10bba2fa3
TreeHugger Robot [Tue, 2 May 2017 15:27:42 +0000 (15:27 +0000)]
Merge "selectBackupTransportAsync should report failure when backup is disabled"
TreeHugger Robot [Tue, 2 May 2017 15:02:24 +0000 (15:02 +0000)]
Merge "Import translations. DO NOT MERGE"
Jerome Gaillard [Tue, 2 May 2017 14:26:18 +0000 (14:26 +0000)]
Merge "Ignore density in AdaptiveIconDrawable"
Jerome Gaillard [Tue, 2 May 2017 14:25:26 +0000 (14:25 +0000)]
Merge "Update AccessibilityManager in layoutlib following I65db0252"
TreeHugger Robot [Tue, 2 May 2017 13:55:16 +0000 (13:55 +0000)]
Merge "CameraMetadataNative: Fix FD leak in dump."
Tony Mak [Tue, 2 May 2017 13:15:10 +0000 (14:15 +0100)]
selectBackupTransportAsync should report failure when backup is disabled
Fix:
37304539
Test: runtest -x frameworks/base/services/tests/servicestests/src/com/android/server/backup/TrampolineTest.java
Test: setup device owner, then set up profile.
Ensure tapping Settings->Google->Work->Security -> Verify app
is working
Change-Id: I393308857ea6082dca167e3e417b946615a83c20
Oleksiy Avramchenko [Tue, 2 May 2017 12:58:12 +0000 (12:58 +0000)]
Merge "Force a light to be set for the first time" am:
e6ad7a6704 am:
96a8556990
am:
db877fa31c
Change-Id: Ib03f7ded6bb232193eec32a4f566244d3caa94b5
Oleksiy Avramchenko [Tue, 2 May 2017 12:53:33 +0000 (12:53 +0000)]
Merge "Force a light to be set for the first time" am:
e6ad7a6704
am:
96a8556990
Change-Id: I5caed909e1ba67931f05b0b44a0ff0fd62b131d0
Oleksiy Avramchenko [Tue, 2 May 2017 12:48:34 +0000 (12:48 +0000)]
Merge "Force a light to be set for the first time"
am:
e6ad7a6704
Change-Id: Icc13b24debc55f4c107dea61123e468a79828f11
Treehugger Robot [Tue, 2 May 2017 12:42:12 +0000 (12:42 +0000)]
Merge "Force a light to be set for the first time"
Narayan Kamath [Tue, 2 May 2017 10:26:33 +0000 (10:26 +0000)]
Merge "Track libcore change
03e8c7dca78a95ccf719a7." am:
194f8471fd am:
f06800c3ff
am:
58508dfd6e
Change-Id: Ia3f2a9ac5843a32da7c730a172af248abebd7b00
Narayan Kamath [Tue, 2 May 2017 10:19:30 +0000 (10:19 +0000)]
Merge "Track libcore change
03e8c7dca78a95ccf719a7." am:
194f8471fd
am:
f06800c3ff
Change-Id: I3c734734bf553e0b4695a897de113d9031f18abd
Narayan Kamath [Tue, 2 May 2017 10:13:48 +0000 (10:13 +0000)]
Merge "Track libcore change
03e8c7dca78a95ccf719a7."
am:
194f8471fd
Change-Id: Ie4fbcc4defee14c91cd3b84adf4f3ae5f47add3f
Narayan Kamath [Tue, 2 May 2017 10:06:48 +0000 (10:06 +0000)]
Merge "Track libcore change
03e8c7dca78a95ccf719a7."
TreeHugger Robot [Tue, 2 May 2017 10:00:22 +0000 (10:00 +0000)]
Merge "Add a time-out for connecting to SystemServer, and WebView, zygotes."
Hugo Benichi [Tue, 2 May 2017 09:09:55 +0000 (09:09 +0000)]
Merge "NsdManager: add test coverage for discoverServices()" am:
3e21b1745c am:
60182dbe4e am:
27b0eebb4d
am:
807c525de2
Change-Id: I2bbd97293d2887824b857d7e20fdc14d574bc097
Hugo Benichi [Tue, 2 May 2017 09:04:59 +0000 (09:04 +0000)]
Merge "NsdManager: add test coverage for discoverServices()" am:
3e21b1745c am:
60182dbe4e
am:
27b0eebb4d
Change-Id: I46acfd104ac3457126c3ccef5041788e4146321c
Hugo Benichi [Tue, 2 May 2017 08:59:22 +0000 (08:59 +0000)]
Merge "NsdManager: add test coverage for discoverServices()" am:
3e21b1745c
am:
60182dbe4e
Change-Id: I341cbbfd36b4e849651505c187053115833ca4b0
Hugo Benichi [Tue, 2 May 2017 08:54:46 +0000 (08:54 +0000)]
Merge "NsdManager: add test coverage for discoverServices()"
am:
3e21b1745c
Change-Id: I0fd1d8e6ea3264a96b144c6701200f7b0be5f9c4
Treehugger Robot [Tue, 2 May 2017 08:44:27 +0000 (08:44 +0000)]
Merge "NsdManager: add test coverage for discoverServices()"
Oleksiy Avramchenko [Tue, 25 Apr 2017 10:30:49 +0000 (12:30 +0200)]
Force a light to be set for the first time
The check in LightImpl::setLightLocked skips HAL call if light
parameters aren't changed. During initialization these parameters
are zeroed, thus it's not possible to turn the light off at the
startup.
As an example this fixes the issue with "stuck" battery light
in the following scenario:
1. Device has secure start-up option set (either pin or pattern).
2. Charger is connected at the startup and battery light shows the
charging state on pin or pattern prompt.
3. Device is unlocked and charger disconnected after some time,
e.g. after com.android.server.lights.LightsService restarted.
4. The battery light is not off and stuck in the previous state
until charger is connected / disconnected again.
Bug:
37662368
Test: manual - follow the above step-by-step
Change-Id: I45470e945fe4d26d37a5641dfff3311968f51ee4
Chulwoo Lee [Tue, 2 May 2017 07:08:41 +0000 (07:08 +0000)]
Merge "Allow null setup activity for TV input" into oc-dev am:
90074d1ec8
am:
6af43e5d6f
Change-Id: I0b791a12cdee5dc5ce4bdc1c27eecd8b0166fc15
Chulwoo Lee [Tue, 2 May 2017 07:02:35 +0000 (07:02 +0000)]
Merge "Allow null setup activity for TV input" into oc-dev
am:
90074d1ec8
Change-Id: I18545582572c60956548af8c732b7e6543f00d76
TreeHugger Robot [Tue, 2 May 2017 06:56:48 +0000 (06:56 +0000)]
Merge "Allow null setup activity for TV input" into oc-dev
Hugo Benichi [Tue, 2 May 2017 06:56:15 +0000 (06:56 +0000)]
Merge "NsdManager: unit test coverage for servive registration" am:
b0e408450c am:
bc57faa1ac am:
9a3e69d9b6
am:
783019d2ff
Change-Id: I88461d537e43fb086366dcc681b5ef2c2bdcdc2f
The Android Open Source Project [Tue, 2 May 2017 06:55:22 +0000 (23:55 -0700)]
Import translations. DO NOT MERGE
Change-Id: Ic4f27d9d16d255a2f13cdf5d1652e593215e43c2
Auto-generated-cl: translation import
Hugo Benichi [Tue, 2 May 2017 06:49:52 +0000 (06:49 +0000)]
Merge "NsdManager: unit test coverage for servive registration" am:
b0e408450c am:
bc57faa1ac
am:
9a3e69d9b6
Change-Id: Ideabb1c929ddd4307e66831cddb20e2feac2c6d9
Hugo Benichi [Tue, 2 May 2017 06:42:44 +0000 (06:42 +0000)]
Merge "NsdManager: unit test coverage for servive registration" am:
b0e408450c
am:
bc57faa1ac
Change-Id: I55a7a1a33cfd30a5c8d5ede67f6a1c602a840e6a
Hugo Benichi [Tue, 2 May 2017 06:35:11 +0000 (06:35 +0000)]
Merge "NsdManager: unit test coverage for servive registration"
am:
b0e408450c
Change-Id: I0b47ad5a1ccee4a2efb169d717b512a46ad4ecc2
Treehugger Robot [Tue, 2 May 2017 06:27:08 +0000 (06:27 +0000)]
Merge "NsdManager: unit test coverage for servive registration"
Hugo Benichi [Fri, 28 Apr 2017 04:29:21 +0000 (13:29 +0900)]
NsdManager: add test coverage for discoverServices()
Test: added new tests
Bug:
37013369,
33298084
Change-Id: If6c1113ee1bd4690db90abd5a61c3e229c827aec
Lorenzo Colitti [Tue, 2 May 2017 04:51:08 +0000 (04:51 +0000)]
Merge "Add a method to start the captive portal login app." into oc-dev am:
5555b1e3d1
am:
6b7553bc21
Change-Id: I65e9632d28e63ba3278a5f396554b7be302e20d1
Lorenzo Colitti [Tue, 2 May 2017 04:44:31 +0000 (04:44 +0000)]
Merge "Add a method to start the captive portal login app." into oc-dev
am:
5555b1e3d1
Change-Id: Ic7c14bd3dfd07f97c04901f043ed1cd3b1eee6e4
Lorenzo Colitti [Tue, 2 May 2017 04:38:50 +0000 (04:38 +0000)]
Merge "Add a method to start the captive portal login app." into oc-dev
Hugo Benichi [Fri, 28 Apr 2017 02:01:22 +0000 (11:01 +0900)]
NsdManager: unit test coverage for servive registration
This patch adds test coverage for NsdManager#registerService() and
NsdManager#unregisterService(). This test shows a potential defect in
the api: if unregisterService() fails, the associated listener is always
unregistered from NsdManager. If the service initially registered is
still registered, this potentially make it impossible to unregister.
Test: added new unit test
Bug:
37013369,
33298084
Change-Id: Ia089b6d2f2a349907a8b29d9a3acd7f59e177887
Casey Burkhardt [Tue, 2 May 2017 04:17:34 +0000 (04:17 +0000)]
Merge "Refactor accessibility button support detection" into oc-dev am:
337e2aae53
am:
7a0de65bee -s ours
Change-Id: I9c6363327716aa3c1ef3f85abb7f8fdd997f7c01
Casey Burkhardt [Tue, 2 May 2017 04:11:01 +0000 (04:11 +0000)]
Merge "Refactor accessibility button support detection" into oc-dev
am:
337e2aae53
Change-Id: I4f96a5ae3e847b2439d017b34038a4b7b07965fa
Casey Burkhardt [Tue, 2 May 2017 04:05:26 +0000 (04:05 +0000)]
Merge "Refactor accessibility button support detection" into oc-dev
Conrad Chen [Tue, 2 May 2017 03:40:54 +0000 (03:40 +0000)]
Merge "TIF: change documentation wording for onSetSurface()" into oc-dev am:
12c6a04db0
am:
526b3914ba
Change-Id: I00cdec5ab86ed4d811931e552188dc809fdae351
Conrad Chen [Tue, 2 May 2017 03:34:25 +0000 (03:34 +0000)]
Merge "TIF: change documentation wording for onSetSurface()" into oc-dev
am:
12c6a04db0
Change-Id: I8c60455d744a2f44175cc913a0266fd6a4cb8995
TreeHugger Robot [Tue, 2 May 2017 03:26:29 +0000 (03:26 +0000)]
Merge "TIF: change documentation wording for onSetSurface()" into oc-dev
Jeremy Joslin [Tue, 2 May 2017 02:28:52 +0000 (02:28 +0000)]
Merge "Adding the AOSP header." into oc-dev am:
35dcb5f5bb
am:
1c64d2941e
Change-Id: Icac0c14c062df32fff14f031cd23cd6b82fff9bf
Jeremy Joslin [Tue, 2 May 2017 02:24:52 +0000 (02:24 +0000)]
Merge "Adding the AOSP header." into oc-dev
am:
35dcb5f5bb
Change-Id: I89a4019f462958c8b87597b5bb3cc11e751fb476
TreeHugger Robot [Tue, 2 May 2017 02:18:50 +0000 (02:18 +0000)]
Merge "Adding the AOSP header." into oc-dev
TreeHugger Robot [Tue, 2 May 2017 02:11:11 +0000 (02:11 +0000)]
Merge "Revert "Revert "Extend extension support"""
Wale Ogunwale [Tue, 2 May 2017 02:09:15 +0000 (02:09 +0000)]
Merge "Don't relaunch activity in TaskRecord.size if caller deferResume" into oc-dev am:
25cedc232d
am:
5cec9b9efa
Change-Id: I844c2808150486f3af9c29b9f8fd2f63f8050a85
The Android Open Source Project [Tue, 2 May 2017 02:07:20 +0000 (02:07 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-dev am:
71d03d43f1 -s ours
am:
5a7917f032 -s ours
Change-Id: Ie5ea19ae950cef38473a0b48fef465b7583f007c
Wale Ogunwale [Tue, 2 May 2017 02:02:13 +0000 (02:02 +0000)]
Merge "Don't relaunch activity in TaskRecord.size if caller deferResume" into oc-dev
am:
25cedc232d
Change-Id: I66994bfd9c39c60f78f2afda6953bef162c74d6f
Casey Burkhardt [Tue, 2 May 2017 02:00:09 +0000 (02:00 +0000)]
Merge "Manually merge CL
2175149 to master for green build"
Peter Qiu [Tue, 2 May 2017 01:58:15 +0000 (01:58 +0000)]
Merge "hotspot2: hide Release 2 APIs" into oc-dev am:
39da850a95
am:
10da2c2d84
Change-Id: I0cad5713f1c272770edd1400d09259b8c3e9932a
The Android Open Source Project [Tue, 2 May 2017 01:55:24 +0000 (01:55 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-dev
am:
71d03d43f1 -s ours
Change-Id: I926c75446383b667bbc70d9e83fe686d6870ef4f
TreeHugger Robot [Tue, 2 May 2017 01:55:15 +0000 (01:55 +0000)]
Merge "Don't relaunch activity in TaskRecord.size if caller deferResume" into oc-dev
The Android Open Source Project [Tue, 2 May 2017 01:53:06 +0000 (01:53 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-dev am:
8864da5149 -s ours
am:
a0c2c89681 -s ours
Change-Id: Ibe6cb0695054f5975f85cc71204736d55c40c153
Peter Qiu [Tue, 2 May 2017 01:52:44 +0000 (01:52 +0000)]
Merge "hotspot2: hide Release 2 APIs" into oc-dev
am:
39da850a95
Change-Id: Id5e1f6184de563b51fcd185fb2768c648f788ff9
TreeHugger Robot [Tue, 2 May 2017 01:48:15 +0000 (01:48 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-dev
The Android Open Source Project [Tue, 2 May 2017 01:48:05 +0000 (01:48 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-dev
am:
8864da5149 -s ours
Change-Id: I6cb8a94cee9188985185288fbf6320c1927bc0c1
Svetoslav Ganov [Tue, 2 May 2017 01:47:11 +0000 (01:47 +0000)]
Merge "Make auth fill UI size sane size" into oc-dev am:
c0851e72a5
am:
f9ec22d29a
Change-Id: Ic093d7cc4d38b22064e6c0e39d71e90e0dd9344e
TreeHugger Robot [Tue, 2 May 2017 01:44:41 +0000 (01:44 +0000)]
Merge "hotspot2: hide Release 2 APIs" into oc-dev
Svetoslav Ganov [Tue, 2 May 2017 01:41:58 +0000 (01:41 +0000)]
Merge "Make auth fill UI size sane size" into oc-dev
am:
c0851e72a5
Change-Id: Ie7ce1a2a92e2fa3e653df3f95be8ff6a8f4d2a47
TreeHugger Robot [Tue, 2 May 2017 01:38:54 +0000 (01:38 +0000)]
Merge "Import translations. DO NOT MERGE"
TreeHugger Robot [Tue, 2 May 2017 01:38:26 +0000 (01:38 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-dev
TreeHugger Robot [Tue, 2 May 2017 01:37:20 +0000 (01:37 +0000)]
Merge "Import translations. DO NOT MERGE"
TreeHugger Robot [Tue, 2 May 2017 01:33:24 +0000 (01:33 +0000)]
Merge "Make auth fill UI size sane size" into oc-dev
Rob Carr [Tue, 2 May 2017 01:17:32 +0000 (01:17 +0000)]
Merge "Fix cropping in docked stack." into oc-dev am:
8658d43382
am:
bdd5e56e77
Change-Id: If60472548a20744b08262ac622b06552417f2bdd
Rob Carr [Tue, 2 May 2017 01:15:35 +0000 (01:15 +0000)]
Merge "Fix rotation animation selection." into oc-dev am:
e8d7c01e8a
am:
0a2b84d6d2
Change-Id: I947689d13d974117273e3e54d4170f8b064927ef
Felipe Leme [Tue, 2 May 2017 01:11:25 +0000 (01:11 +0000)]
Merge "Removed deprecated setAuthentication() method that didn't take ids." into oc-dev am:
136a48e36a
am:
68eecb37d8
Change-Id: If40b81d68913a162f77581b09932647846c992c1
Rob Carr [Tue, 2 May 2017 01:11:16 +0000 (01:11 +0000)]
Merge "Fix cropping in docked stack." into oc-dev
am:
8658d43382
Change-Id: I2202a702f7d30c991399eccaa330ddfa650f5278
Eric Laurent [Tue, 2 May 2017 01:09:44 +0000 (01:09 +0000)]
Merge "AudioService: send AUDIO_BECOMING_NOISY intent when disconnecting USB" into oc-dev am:
fe79cbed5d
am:
6405b60225
Change-Id: I79b05c9e161789b48026584dd8e5d00152b419a7
Rob Carr [Tue, 2 May 2017 01:09:25 +0000 (01:09 +0000)]
Merge "Fix rotation animation selection." into oc-dev
am:
e8d7c01e8a
Change-Id: Ife07062b479b5cffc6e56a8d46d545c22caf8198
Rob Carr [Tue, 2 May 2017 01:03:44 +0000 (01:03 +0000)]
Merge "Fix cropping in docked stack." into oc-dev
Felipe Leme [Tue, 2 May 2017 01:02:55 +0000 (01:02 +0000)]
Merge "Removed deprecated setAuthentication() method that didn't take ids." into oc-dev
am:
136a48e36a
Change-Id: Ia81cd576c5acdaf0008c21fbea9fb5a16c3c89bf
Rob Carr [Tue, 2 May 2017 01:01:29 +0000 (01:01 +0000)]
Merge "Fix rotation animation selection." into oc-dev
Jeff Sharkey [Tue, 2 May 2017 01:01:17 +0000 (01:01 +0000)]
Merge "Video badging levels: @Deprecate and @remove" into oc-dev am:
0a5b14309a
am:
43ddd0f31d
Change-Id: I3f66d8adaed78ea53f52d97e51c986487def3818
Eric Laurent [Tue, 2 May 2017 01:01:13 +0000 (01:01 +0000)]
Merge "AudioService: send AUDIO_BECOMING_NOISY intent when disconnecting USB" into oc-dev
am:
fe79cbed5d
Change-Id: I1f10b386f6e71d3c758199d880e235a0775aea66
TreeHugger Robot [Tue, 2 May 2017 00:53:30 +0000 (00:53 +0000)]
Merge "Removed deprecated setAuthentication() method that didn't take ids." into oc-dev
Jeff Sharkey [Tue, 2 May 2017 00:53:04 +0000 (00:53 +0000)]
Merge "Video badging levels: @Deprecate and @remove" into oc-dev
am:
0a5b14309a
Change-Id: Icce4883fe59bede2e91c091b8e4734b7224eb0e3
The Android Open Source Project [Tue, 2 May 2017 00:46:21 +0000 (17:46 -0700)]
Import translations. DO NOT MERGE
Change-Id: I11ae372fe8c9b647df4f1ea5e8e5c96927d2fe85
Auto-generated-cl: translation import
TreeHugger Robot [Tue, 2 May 2017 00:45:39 +0000 (00:45 +0000)]
Merge "AudioService: send AUDIO_BECOMING_NOISY intent when disconnecting USB" into oc-dev
Jeff Sharkey [Tue, 2 May 2017 00:44:47 +0000 (00:44 +0000)]
Merge "Video badging levels: @Deprecate and @remove" into oc-dev
Adam Powell [Mon, 1 May 2017 23:48:57 +0000 (23:48 +0000)]
Merge "Hide FragmentContainer#instantiate for API 26" into oc-dev am:
ba9b2ce254
am:
d1832d7bf8
Change-Id: Ic5186638644ef7b1654d473c15866476788ccfaa
Jeremy Joslin [Tue, 25 Apr 2017 22:43:13 +0000 (15:43 -0700)]
Adding the AOSP header.
Test: make
Bug:
37683421
Change-Id: I0c656b91f3533b87a80c34e7461000e75ee1da8e
The Android Open Source Project [Mon, 1 May 2017 23:47:11 +0000 (16:47 -0700)]
Import translations. DO NOT MERGE
Change-Id: Iae5f3f4f17f19f75e5cbf73133e88105fab69622
Auto-generated-cl: translation import
Eugene Susla [Mon, 1 May 2017 23:46:52 +0000 (23:46 +0000)]
Merge "Change protection level of companion permissions" into oc-dev am:
897f883409
am:
84666dc643
Change-Id: I74c400f5bbf66f8c2032dd2445dfcb0a3ffb4edc
Hyunyoung Song [Mon, 1 May 2017 23:40:10 +0000 (23:40 +0000)]
Merge "Add @TestApi annotation to AdaptiveIconDrawable" into oc-dev am:
1e8f451bbf
am:
090109cb19
Change-Id: I688ef5dd83d10529e8669dfb9e5ea818e0fdc348
Adam Powell [Mon, 1 May 2017 23:37:00 +0000 (23:37 +0000)]
Merge "Hide FragmentContainer#instantiate for API 26" into oc-dev
am:
ba9b2ce254
Change-Id: I787a726517687d1cec60a0f96d3abef3229a5dcc
Jeff Sharkey [Mon, 1 May 2017 23:36:36 +0000 (23:36 +0000)]
Merge "Rename to follow API council guidance." into oc-dev am:
0d6c3a691e
am:
6560d8845b
Change-Id: Ie9b4a033dfb08ea9326725e66ed4787a1ed69651
Jason Monk [Mon, 1 May 2017 19:38:34 +0000 (15:38 -0400)]
Revert "Revert "Extend extension support""
This reverts commit
e9f2d284ef044c6df15165092036b9ef80ebb790.
Test: runtest systemui
Change-Id: I6d1ca9af8ee2fb4b242ccd2f9772f7d23cc35866
Eugene Susla [Mon, 1 May 2017 23:32:21 +0000 (23:32 +0000)]
Merge "Change protection level of companion permissions" into oc-dev
am:
897f883409
Change-Id: I5b123b603debc11a6ef0ed12a5f6da5d0c3ee533
TreeHugger Robot [Mon, 1 May 2017 23:30:08 +0000 (23:30 +0000)]
Merge "Hide FragmentContainer#instantiate for API 26" into oc-dev
Hyunyoung Song [Mon, 1 May 2017 23:28:48 +0000 (23:28 +0000)]
Merge "Add @TestApi annotation to AdaptiveIconDrawable" into oc-dev
am:
1e8f451bbf
Change-Id: I9d95fdcd56ccf99fe497b68f85fd5db036548a83
Adrian Roos [Mon, 1 May 2017 23:27:13 +0000 (23:27 +0000)]
Merge "AOD: Increase shelf icon size while dark" into oc-dev am:
f852ed40a6
am:
b1539f82f5
Change-Id: Id3469ac59c9799160eca2034ec42e029b967d00b
Jeff Sharkey [Mon, 1 May 2017 23:25:24 +0000 (23:25 +0000)]
Merge "Rename to follow API council guidance." into oc-dev
am:
0d6c3a691e
Change-Id: I9116471537b51bd3aa785ff21f0bef48ec380889
Peter Qiu [Mon, 1 May 2017 22:59:53 +0000 (15:59 -0700)]
hotspot2: hide Release 2 APIs
Bug:
37514629
Test: builds
Change-Id: Idcd684cf9846791cb02ae0f74ec35ff4850666f1
TreeHugger Robot [Mon, 1 May 2017 23:22:06 +0000 (23:22 +0000)]
Merge "Change protection level of companion permissions" into oc-dev
Adrian Roos [Mon, 1 May 2017 23:20:00 +0000 (23:20 +0000)]
Merge "AOD: Increase shelf icon size while dark" into oc-dev
am:
f852ed40a6
Change-Id: Ic9d9e0878695962e947a0f9cc25e012350f7ffba
TreeHugger Robot [Mon, 1 May 2017 23:18:37 +0000 (23:18 +0000)]
Merge "Add @TestApi annotation to AdaptiveIconDrawable" into oc-dev
OSDN Git Service
