OSDN Git Service
Jean-Michel Trivi [Mon, 14 Aug 2017 22:41:13 +0000 (22:41 +0000)]
Merge "Fix logic for Intent.ACTION_HEADSET_PLUG for USB headsets" into oc-dr1-dev am:
21f3489653
am:
b7aade045d
Change-Id: I640a4e72df2bf3e43136d8dc70000ba0305a083b
Jean-Michel Trivi [Mon, 14 Aug 2017 22:28:45 +0000 (22:28 +0000)]
Merge "Fix logic for Intent.ACTION_HEADSET_PLUG for USB headsets" into oc-dr1-dev
am:
21f3489653
Change-Id: I357a84f9249c466bd259798d3d073886a61af8f0
TreeHugger Robot [Mon, 14 Aug 2017 22:13:32 +0000 (22:13 +0000)]
Merge "Fix logic for Intent.ACTION_HEADSET_PLUG for USB headsets" into oc-dr1-dev
Todd Kennedy [Mon, 14 Aug 2017 22:06:30 +0000 (22:06 +0000)]
Merge "Always invoke callback" into oc-mr1-dev
am:
71b304f6ff
Change-Id: Id70e129c930cf7f21feebc8d22649cee779e37b6
Todd Kennedy [Mon, 14 Aug 2017 22:01:04 +0000 (22:01 +0000)]
Merge "Remove using package name" into oc-mr1-dev
am:
941fab312c
Change-Id: I35530f9a9c0044d6842b9698f758b2f1cf468f1b
TreeHugger Robot [Mon, 14 Aug 2017 21:51:42 +0000 (21:51 +0000)]
Merge "Always invoke callback" into oc-mr1-dev
TreeHugger Robot [Mon, 14 Aug 2017 21:51:08 +0000 (21:51 +0000)]
Merge "Remove using package name" into oc-mr1-dev
Nate Fischer [Mon, 14 Aug 2017 21:30:40 +0000 (21:30 +0000)]
Merge "WebView: switch to OMR1 FactoryProvider" into oc-mr1-dev
am:
417944624b
Change-Id: I8f00790c93646767aead0b3393bae569d82271b4
TreeHugger Robot [Mon, 14 Aug 2017 21:17:46 +0000 (21:17 +0000)]
Merge "WebView: switch to OMR1 FactoryProvider" into oc-mr1-dev
Fyodor Kupolov [Mon, 14 Aug 2017 21:10:59 +0000 (21:10 +0000)]
Merge "Log timings for shutdown stages" into oc-mr1-dev
am:
fe97799d5d
Change-Id: Iee66b180ecec69872ac2e96bb943e9d02afc33df
Fyodor Kupolov [Mon, 14 Aug 2017 21:00:34 +0000 (21:00 +0000)]
Merge "Make SQLiteDirectCursorDriver @TestApi" into oc-mr1-dev
am:
9b9d310a6d
Change-Id: I69fb3bafc5a77d188e58b11878290da59840b9d5
Fyodor Kupolov [Mon, 14 Aug 2017 20:55:13 +0000 (20:55 +0000)]
Merge "Log timings for shutdown stages" into oc-mr1-dev
TreeHugger Robot [Mon, 14 Aug 2017 20:52:26 +0000 (20:52 +0000)]
Merge "Make SQLiteDirectCursorDriver @TestApi" into oc-mr1-dev
Tyler Gunn [Mon, 14 Aug 2017 19:05:31 +0000 (19:05 +0000)]
Merge "Ensure CallId is not null when connection creation is complete." into oc-mr1-dev
am:
9ad54229f5
Change-Id: I1de7a0a4cc9c630019e38b8154bfc1d470f56ae3
TreeHugger Robot [Mon, 14 Aug 2017 18:49:14 +0000 (18:49 +0000)]
Merge "Ensure CallId is not null when connection creation is complete." into oc-mr1-dev
Nate Fischer [Wed, 9 Aug 2017 06:22:47 +0000 (23:22 -0700)]
WebView: switch to OMR1 FactoryProvider
We now fetch the *ForOMR1 class instead of *ForO, which enables
OMR1-specific code in the WebView APK.
Bug:
63687088
Test: N/A
Change-Id: Ia36a00cd26aff8b87d7aeae859c72cb2fb364d2c
Fyodor Kupolov [Fri, 11 Aug 2017 00:00:43 +0000 (17:00 -0700)]
Log timings for shutdown stages
Renamed BootTimingsTraceLog to TimingsTraceLog. It is now used for
boot and shutdown logging.
Added measurements for main stages of shutdown in the system server:
ShutdownTiming: SendShutdownBroadcast took to complete: 734ms
ShutdownTiming: ShutdownActivityManager took to complete: 203ms
ShutdownTiming: ShutdownPackageManager took to complete: 17ms
ShutdownTiming: ShutdownBt took to complete: 533ms
ShutdownTiming: ShutdownRadio took to complete: 534ms
ShutdownTiming: ShutdownNfc took to complete: 1536ms
ShutdownTiming: ShutdownRadios took to complete: 1538ms
ShutdownTiming: ShutdownStorageManager took to complete: 906ms
ShutdownTiming: SystemServerShutdown took to complete: 3918ms
Bug:
64569080
Test: shutdown/reboot and check logs
Change-Id: I636c045852cd1ed6be1c58af6608f70e95756389
Jason Monk [Mon, 14 Aug 2017 18:14:19 +0000 (18:14 +0000)]
Merge "Always show global actions on the right" into oc-mr1-dev
am:
a2991d045d
Change-Id: Ibf5098d39349a024509a764373ea0bfb8d18d8be
Jason Monk [Mon, 14 Aug 2017 18:08:00 +0000 (18:08 +0000)]
Merge "Switch battery saver to sentence case" into oc-mr1-dev
am:
449bb694b4
Change-Id: If4a572c8601ff6e6ad4e77b09002142bd3ab760e
TreeHugger Robot [Mon, 14 Aug 2017 18:04:10 +0000 (18:04 +0000)]
Merge "Always show global actions on the right" into oc-mr1-dev
Jason Monk [Mon, 14 Aug 2017 18:03:12 +0000 (18:03 +0000)]
Merge "Make sure network tests pass with airplane mode on" into oc-mr1-dev
am:
d35b6a7c26
Change-Id: I48f774cf277543c5224958520e3bd78aac776a0c
TreeHugger Robot [Mon, 14 Aug 2017 17:42:09 +0000 (17:42 +0000)]
Merge "Switch battery saver to sentence case" into oc-mr1-dev
Bryan Eyler [Mon, 14 Aug 2017 17:39:11 +0000 (17:39 +0000)]
Merge "Use first letter of user for icons." into oc-mr1-dev
am:
30f9d275e9
Change-Id: I4863e25aaf36df1fcd89925475762f60a3218915
TreeHugger Robot [Mon, 14 Aug 2017 17:34:54 +0000 (17:34 +0000)]
Merge "Make sure network tests pass with airplane mode on" into oc-mr1-dev
Bryan Eyler [Mon, 14 Aug 2017 17:30:44 +0000 (17:30 +0000)]
Merge "Use first letter of user for icons." into oc-mr1-dev
Mathieu Chartier [Mon, 14 Aug 2017 17:06:32 +0000 (17:06 +0000)]
Merge "Add frameworks base config and move text blobs there" into oc-mr1-dev
am:
fcfe9d8418
Change-Id: Ida4184144880ef5c3f6a5522231b0a3edc31a4e4
Jeremy Joslin [Mon, 14 Aug 2017 16:59:06 +0000 (16:59 +0000)]
Merge "Add permission checks to getActiveScorerPackage()." into oc-mr1-dev
am:
66042e0caf
Change-Id: I8a090f5dfbdc6d47de9838d8c8bf48f95d831531
Mathieu Chartier [Mon, 14 Aug 2017 16:53:12 +0000 (16:53 +0000)]
Merge "Add frameworks base config and move text blobs there" into oc-mr1-dev
TreeHugger Robot [Mon, 14 Aug 2017 16:50:50 +0000 (16:50 +0000)]
Merge "Add permission checks to getActiveScorerPackage()." into oc-mr1-dev
Tyler Gunn [Sat, 17 Jun 2017 03:20:34 +0000 (20:20 -0700)]
Ensure CallId is not null when connection creation is complete.
When calling "get" on the mConnectoinById map, a null callId will result
in an NPE.
In findConnectionForAction, defaulting to returning the "null" connection
which is the same behavior as if it isn't found.
In notifyCreateConnectionComplete, specifically checking if the callId
is null and skipping the onCreateConnectionComplete callback.
This scenario is possible if the connection is remove from the
ConnectionService before the connection complete callback comes back from
Telecom.
Test: Manual
Fixes:
62588734
Change-Id: Ie610c51155ed417e0f916000fe20e4484bdb6603
Jason Monk [Mon, 14 Aug 2017 15:15:07 +0000 (11:15 -0400)]
Always show global actions on the right
It should be aligned with the physical power buttons.
Test: visual
Change-Id: Icec9fe00fdce42d0bf347691ab7629c4ca38df78
Fixes:
63846903
Jason Monk [Mon, 14 Aug 2017 15:04:42 +0000 (11:04 -0400)]
Make sure network tests pass with airplane mode on
Test: runtest systemui
Change-Id: I0cc619d28b6802c0791c5880651ce1f91ea83f35
Fixes:
38023097
Adrian Roos [Mon, 14 Aug 2017 14:50:31 +0000 (14:50 +0000)]
Merge "FRP: Add migration for upgrading from a version without FRP credential" into oc-mr1-dev
am:
4996a35843
Change-Id: I3d7d8255703d805e8d74a22e1ef8e1f8476960d4
Jason Monk [Mon, 14 Aug 2017 14:50:25 +0000 (10:50 -0400)]
Switch battery saver to sentence case
Test: strings
Change-Id: I01bc6f3621758dc155347946b8a15c885c695b2c
Fixes:
27844148
TreeHugger Robot [Mon, 14 Aug 2017 14:43:50 +0000 (14:43 +0000)]
Merge "FRP: Add migration for upgrading from a version without FRP credential" into oc-mr1-dev
Bill Yi [Mon, 14 Aug 2017 13:44:04 +0000 (13:44 +0000)]
Merge "Revert "Import translations. DO NOT MERGE"" into oc-mr1-dev
am:
62f46d483b -s ours
Change-Id: I81b76102be9a4bcc69763572a9c438497245940b
Bill Yi [Mon, 14 Aug 2017 13:40:22 +0000 (13:40 +0000)]
Merge "Revert "Import translations. DO NOT MERGE"" into oc-mr1-dev
am:
be0d49abcd -s ours
Change-Id: I3a315752493d9ed1ab20b4287b828c0cc11e7ef9
Bill Yi [Mon, 14 Aug 2017 13:36:36 +0000 (13:36 +0000)]
Merge "Revert "Import translations. DO NOT MERGE"" into oc-mr1-dev
Bill Yi [Mon, 14 Aug 2017 13:35:56 +0000 (13:35 +0000)]
Revert "Import translations. DO NOT MERGE"
This reverts commit
4a4ff70ab2eaadf6ff2673db7a2454d54526d451.
Change-Id: I27cd5204cc25e664b2722815f9efcfa0fde6b48b
Bill Yi [Mon, 14 Aug 2017 13:31:57 +0000 (13:31 +0000)]
Merge "Revert "Import translations. DO NOT MERGE"" into oc-mr1-dev
Bill Yi [Mon, 14 Aug 2017 13:30:57 +0000 (13:30 +0000)]
Revert "Import translations. DO NOT MERGE"
This reverts commit
24a1e22eb8d821175c2d636bc0e02509408b2050.
Change-Id: Ib2fd9e19b362357652566487ae8e84a9ef993b4b
Michal Karpinski [Mon, 14 Aug 2017 13:21:18 +0000 (13:21 +0000)]
Add extra about SDK version that system restore happened from to ACTION_SETTING_RESTORED intent
am:
6135a26551
Change-Id: I25663df1efd88216b0bdbe22cc53aaaaf0d3dd75
Joachim Sauer [Mon, 14 Aug 2017 13:03:12 +0000 (13:03 +0000)]
Merge "API updated for ICU4J 59.1" am:
365178394d am:
b418181e01 am:
a3f84dc2ee
am:
dadbe89a85
Change-Id: I744316212c5b79ad33a825602852c7c0c4a57b90
Joachim Sauer [Mon, 14 Aug 2017 12:52:11 +0000 (12:52 +0000)]
Merge "API updated for ICU4J 59.1" am:
365178394d am:
b418181e01
am:
a3f84dc2ee
Change-Id: I4b3cad8f696f4f00fcaa7b850821bcfe119188ea
Joachim Sauer [Mon, 14 Aug 2017 12:39:15 +0000 (12:39 +0000)]
Merge "API updated for ICU4J 59.1" am:
365178394d
am:
b418181e01
Change-Id: I6cf0840b5a8d1e32e0e872e44aa381f2c6ee15f8
Joachim Sauer [Mon, 14 Aug 2017 12:28:51 +0000 (12:28 +0000)]
Merge "API updated for ICU4J 59.1"
am:
365178394d
Change-Id: I74a98d63f9f170f6401a87c559fd0eccf06cb8f2
Joachim Sauer [Mon, 14 Aug 2017 12:19:39 +0000 (12:19 +0000)]
Merge "API updated for ICU4J 59.1"
Michal Karpinski [Fri, 11 Aug 2017 09:45:58 +0000 (10:45 +0100)]
Add extra about SDK version that system restore happened from
to ACTION_SETTING_RESTORED intent
Test: manual (system restore from N-MR1 and O)
Bug:
64232609
Change-Id: I142df7acb11309bc4f5f185e45a1f91f86d0334a
Android Build Merger (Role) [Mon, 14 Aug 2017 07:17:27 +0000 (07:17 +0000)]
Merge "Use fullscreen flag to define visibility of the background am:
b60e1c037a am:
41e0c055af" into oc-mr1-dev-plus-aosp
Andrii Kulian [Mon, 14 Aug 2017 07:13:33 +0000 (07:13 +0000)]
Use fullscreen flag to define visibility of the background am:
b60e1c037a
am:
41e0c055af
Change-Id: Ib9fcd7c850675398347f02d56484a074c73ff6a4
Andrii Kulian [Mon, 14 Aug 2017 07:07:41 +0000 (07:07 +0000)]
Use fullscreen flag to define visibility of the background am:
b60e1c037a
am:
1e3b49c104
Change-Id: I842aaa20d40b21c16c11b017c6d2fc2498a87f08
Andrii Kulian [Mon, 14 Aug 2017 06:56:10 +0000 (06:56 +0000)]
Use fullscreen flag to define visibility of the background
am:
b60e1c037a
Change-Id: I1f8ee7304335585b5005bd3ed2be4f77b28093c7
Andrii Kulian [Mon, 14 Aug 2017 06:56:08 +0000 (06:56 +0000)]
Use fullscreen flag to define visibility of the background
am:
b60e1c037a
Change-Id: I8a3e225d3654a206bf607a4077240f5c930f6ffe
Andrii Kulian [Fri, 11 Aug 2017 23:39:53 +0000 (16:39 -0700)]
Use fullscreen flag to define visibility of the background
Use fullscreen state provided by AM as a more reliable
source of truth to check if activity window hides other
windows behind.
Bug:
64615361
Test: Open Play Newsstand, click on article, go to and from Recents.
Change-Id: Ibc40a4241ed131f74da47c0d22833d2c3994cbe0
Jeff Sharkey [Sat, 12 Aug 2017 19:55:45 +0000 (19:55 +0000)]
Merge "Someone is still using these APIs." into oc-mr1-dev
am:
9bb002ef79
Change-Id: I6197e014334790960e4060311d7b0e015438c953
TreeHugger Robot [Sat, 12 Aug 2017 19:51:30 +0000 (19:51 +0000)]
Merge "Someone is still using these APIs." into oc-mr1-dev
Bill Yi [Sat, 12 Aug 2017 19:01:35 +0000 (19:01 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-mr1-dev
am:
62d746169f -s ours
Change-Id: I2219bd5cfa62325ccfd20fa957569a5bf40b942b
TreeHugger Robot [Sat, 12 Aug 2017 18:55:03 +0000 (18:55 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-mr1-dev
Jeff Sharkey [Sat, 12 Aug 2017 05:24:01 +0000 (23:24 -0600)]
Someone is still using these APIs.
Which is totally lame.
Change-Id: Iaabfc1f5ac69ed99e714e89344bde116c340c376
Bill Yi [Sat, 12 Aug 2017 18:22:34 +0000 (18:22 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-mr1-dev
am:
f691736e82 -s ours
Change-Id: I342c96cb84c88b03262342d2014a18469f6ec5ba
TreeHugger Robot [Sat, 12 Aug 2017 18:16:09 +0000 (18:16 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-mr1-dev
Bill Yi [Sat, 12 Aug 2017 17:11:58 +0000 (17:11 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-mr1-dev
am:
264998a80f -s ours
Change-Id: Ic9eefceb410cce8f09b12d7918365426b98b94cd
Android Build Merger (Role) [Sat, 12 Aug 2017 17:08:50 +0000 (17:08 +0000)]
Merge "Merge "Import translations. DO NOT MERGE" into oc-dr1-dev am:
d8330556b3 -s ours am:
bb0c01e7ef -s ours" into oc-mr1-dev-plus-aosp
TreeHugger Robot [Sat, 12 Aug 2017 17:07:56 +0000 (17:07 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-mr1-dev
Bill Yi [Sat, 12 Aug 2017 17:05:52 +0000 (17:05 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-dr1-dev am:
d8330556b3 -s ours
am:
bb0c01e7ef -s ours
Change-Id: I9bde57b325db65ef7890eaf52677638bca442092
Bill Yi [Sat, 12 Aug 2017 17:04:52 +0000 (17:04 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-dr1-dev am:
d8330556b3 -s ours
am:
f102825d6d -s ours
Change-Id: I07492193d0235ee255103cc93016f6ae191706ec
Bill Yi [Sat, 12 Aug 2017 16:59:24 +0000 (16:59 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-dr1-dev am:
e916c1a05f -s ours
am:
48aa2bd9cc -s ours
Change-Id: I060033ee0e59cb6ce7a1bcfb54e4858266e3c370
Bill Yi [Sat, 12 Aug 2017 16:55:33 +0000 (16:55 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-dr1-dev
am:
d8330556b3 -s ours
Change-Id: Ia2f22fd6a148cd47f37c5288940801853f2b9ee1
Bill Yi [Sat, 12 Aug 2017 16:53:44 +0000 (16:53 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-dr1-dev
am:
d8330556b3 -s ours
Change-Id: Ib0241e17096194d42aed1d31cabf1ab7dde44719
Bill Yi [Sat, 12 Aug 2017 16:53:34 +0000 (16:53 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-dr1-dev am:
e916c1a05f -s ours
am:
f0f1bb9ca0 -s ours
Change-Id: I79b6d82105c11124b8f3734d23f77598976957d0
Bill Yi [Sat, 12 Aug 2017 16:49:12 +0000 (16:49 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-dr1-dev
am:
e916c1a05f -s ours
Change-Id: I0cd5c2cac5190abf33d2dc56ebaf4259d358caad
Bill Yi [Sat, 12 Aug 2017 16:42:21 +0000 (16:42 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-dr1-dev
am:
e916c1a05f -s ours
Change-Id: I7e58f8e27052c54c02dbaa9c8430d1e97c4cf3c4
TreeHugger Robot [Sat, 12 Aug 2017 16:38:11 +0000 (16:38 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-dr1-dev
Bill Yi [Sat, 12 Aug 2017 16:37:59 +0000 (16:37 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-mr1-dev
am:
37f09d5a49 -s ours
Change-Id: I8bea5934dda3f270ba76b37ebd8903c3a5fc1612
TreeHugger Robot [Sat, 12 Aug 2017 16:36:25 +0000 (16:36 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-dr1-dev
TreeHugger Robot [Sat, 12 Aug 2017 16:31:03 +0000 (16:31 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-mr1-dev
Bill Yi [Sat, 12 Aug 2017 14:49:46 +0000 (07:49 -0700)]
Import translations. DO NOT MERGE
Change-Id: I2b2f1d8419e704a0ce8064158ec3e26b79b45d2f
Auto-generated-cl: translation import
Exempt-From-Owner-Approval: translation import
Bill Yi [Sat, 12 Aug 2017 14:17:15 +0000 (07:17 -0700)]
Import translations. DO NOT MERGE
Change-Id: Ia4d8ddb6e113bbe2cccf4dc6d2a1c69cc0ea7746
Auto-generated-cl: translation import
Exempt-From-Owner-Approval: translation import
Bill Yi [Sat, 12 Aug 2017 06:38:55 +0000 (23:38 -0700)]
Import translations. DO NOT MERGE
Change-Id: Ia29eec5aefc2e6751d5d97421e99aa0594b032cf
Auto-generated-cl: translation import
Exempt-From-Owner-Approval: translation import
Android Build Merger (Role) [Sat, 12 Aug 2017 06:33:38 +0000 (06:33 +0000)]
Merge "Merge "Update background crop animation threshold" into oc-dr1-dev am:
79e11e4429 am:
e76fc100e4" into oc-mr1-dev-plus-aosp
Andrii Kulian [Sat, 12 Aug 2017 06:30:44 +0000 (06:30 +0000)]
Merge "Update background crop animation threshold" into oc-dr1-dev am:
79e11e4429
am:
e76fc100e4
Change-Id: Iff691c251f84d0d4f2a3b2dac59ad48972bba20e
Andrii Kulian [Sat, 12 Aug 2017 06:24:54 +0000 (06:24 +0000)]
Merge "Update background crop animation threshold" into oc-dr1-dev am:
79e11e4429
am:
27ad3f1e48
Change-Id: I35d6b6b8dfb064b7fd7ae1d8ee24fce4aebd5d27
Andrii Kulian [Sat, 12 Aug 2017 06:22:20 +0000 (06:22 +0000)]
Merge "Update background crop animation threshold" into oc-dr1-dev
am:
79e11e4429
Change-Id: I6fada8610ecbce5dc31683e7a3a0f4072a3e6ced
Andrii Kulian [Sat, 12 Aug 2017 06:17:29 +0000 (06:17 +0000)]
Merge "Update background crop animation threshold" into oc-dr1-dev
am:
79e11e4429
Change-Id: Ica3d6afccce4fce1ca1431b3bbb6e7a2b952771d
Bill Yi [Sat, 12 Aug 2017 06:17:19 +0000 (23:17 -0700)]
Import translations. DO NOT MERGE
Change-Id: I7837d78bd145f55471ea2b0ba11890f0f3a2552c
Auto-generated-cl: translation import
Exempt-From-Owner-Approval: translation import
TreeHugger Robot [Sat, 12 Aug 2017 06:09:06 +0000 (06:09 +0000)]
Merge "Update background crop animation threshold" into oc-dr1-dev
Jeff Sharkey [Sat, 12 Aug 2017 06:04:41 +0000 (06:04 +0000)]
Merge "Catch exception when notifying Settings changes." into oc-mr1-dev
am:
e791b5e778
Change-Id: Idb281592ac72a3bfb56c48bb31f840f39bf6801c
TreeHugger Robot [Sat, 12 Aug 2017 05:59:17 +0000 (05:59 +0000)]
Merge "Catch exception when notifying Settings changes." into oc-mr1-dev
Ian Pedowitz [Sat, 12 Aug 2017 05:54:51 +0000 (05:54 +0000)]
Merge changes from topic 'b/
64606807' into oc-dr1-dev am:
8193291ca3 -s ours
am:
706afb3221 -s ours
Change-Id: Ie3331beb2388cfb97574d3f61d93fe3a86f16e25
Ian Pedowitz [Sat, 12 Aug 2017 05:46:38 +0000 (05:46 +0000)]
Merge changes from topic 'b/
64606807' into oc-dr1-dev am:
8193291ca3 -s ours
am:
b10fd850a7 -s ours
Change-Id: I99f3dc63c92d1c2172ba80d3a1e5fc576233a20b
Ian Pedowitz [Sat, 12 Aug 2017 05:38:40 +0000 (05:38 +0000)]
Merge changes from topic 'b/
64606807' into oc-dr1-dev
am:
8193291ca3 -s ours
Change-Id: Ia1b92d79e68c93616321512f00da671c912df1a3
Ian Pedowitz [Sat, 12 Aug 2017 05:38:37 +0000 (05:38 +0000)]
Merge changes from topic 'b/
64606807' into oc-dr1-dev
am:
8193291ca3 -s ours
Change-Id: I4b4b8117db913ac797abb99b92ae5430193866e6
TreeHugger Robot [Sat, 12 Aug 2017 05:30:30 +0000 (05:30 +0000)]
Merge changes from topic 'b/
64606807' into oc-dr1-dev
* changes:
Revert "Add (disabled) time zone update system server impl"
Revert "Time zone update API classes"
Android Build Merger (Role) [Sat, 12 Aug 2017 04:18:45 +0000 (04:18 +0000)]
Merge "Merge "Move DISABLE_INPUT_DEVICE permission" into oc-dr1-dev am:
a031b0d6a1 am:
1f368850d8 -s ours" into oc-mr1-dev-plus-aosp
Neil Fuller [Sat, 12 Aug 2017 04:13:28 +0000 (04:13 +0000)]
Merge "Move DISABLE_INPUT_DEVICE permission" into oc-dr1-dev am:
a031b0d6a1
am:
1f368850d8 -s ours
Change-Id: Ibdf452819ba5c7f5b65aab17dc7e93874aa33d74
Neil Fuller [Sat, 12 Aug 2017 04:08:21 +0000 (04:08 +0000)]
Merge "Move DISABLE_INPUT_DEVICE permission" into oc-dr1-dev am:
a031b0d6a1 -s ours
am:
a19580fd71 -s ours
Change-Id: I8cee159484faf9f30205dcde0f0b527d3bf620e6
Android Build Merger (Role) [Sat, 12 Aug 2017 04:03:00 +0000 (04:03 +0000)]
Merge "Move USE_COLORIZED_NOTIFICATIONS to com.android. am:
708a1ca16a -s ours am:
976b21162d -s ours" into oc-mr1-dev-plus-aosp
Neil Fuller [Sat, 12 Aug 2017 04:00:36 +0000 (04:00 +0000)]
Merge "Move DISABLE_INPUT_DEVICE permission" into oc-dr1-dev
am:
a031b0d6a1
Change-Id: I1a1a6468921ca5e23cc250aacb713153433917a3
Neil Fuller [Sat, 12 Aug 2017 04:00:23 +0000 (04:00 +0000)]
Merge "Move DISABLE_INPUT_DEVICE permission" into oc-dr1-dev
am:
a031b0d6a1 -s ours
Change-Id: I3971f4e7d4d21630d7055d74207f08813b26d875
Dan Sandler [Sat, 12 Aug 2017 03:59:34 +0000 (03:59 +0000)]
Move USE_COLORIZED_NOTIFICATIONS to com.android. am:
708a1ca16a -s ours
am:
976b21162d -s ours
Change-Id: I56883636bbd6714f4521cbea5a318da12eff07bb
OSDN Git Service
