git.osdn.net Git - android-x86/frameworks-base.git/log

Fyodor Kupolov [Thu, 6 Jul 2017 19:03:33 +0000 (19:03 +0000)]

Merge "Merge "Merge "Fix ContentObserver unregister issue" am: 09b6988e27" into stage-aosp-master am: 785ab04d7a" into oc-dev-plus-aosp am: d6bb9401eb
am: f888e4248a

Change-Id: I789b3c22df6bb9b7eebd8beb5d9cd968a50c460e

commit | commitdiff | tree

Fyodor Kupolov [Thu, 6 Jul 2017 19:01:53 +0000 (19:01 +0000)]

Merge "Merge "Merge "Fix ContentObserver unregister issue" am: 09b6988e27" into stage-aosp-master am: 785ab04d7a" into oc-dev-plus-aosp am: f035f800b7
am: 6b4b8e50c5

Change-Id: I6415e3e5fca39bc3577bea00830bb0ed12692d46

commit | commitdiff | tree

Fyodor Kupolov [Thu, 6 Jul 2017 19:00:21 +0000 (19:00 +0000)]

Merge "Merge "Fix ContentObserver unregister issue" am: 09b6988e27 am: 481d92c517" into oc-dev-plus-aosp am: 6c6b3820f7
am: 40e4512ad6

Change-Id: I129746e6ab18e6f433f6a8500773b2d5a7290b56

commit | commitdiff | tree

TreeHugger Robot [Thu, 6 Jul 2017 18:54:49 +0000 (18:54 +0000)]

Merge "Return result when set tile enabled/disabled"

commit | commitdiff | tree

Android Build Merger (Role) [Thu, 6 Jul 2017 18:48:27 +0000 (18:48 +0000)]

Merge "Merge "Fix ContentObserver unregister issue" am: 09b6988e27 am: 481d92c517 am: aee5787b48 am: 16ff7bc82a"

commit | commitdiff | tree

Android Build Merger (Role) [Thu, 6 Jul 2017 18:47:55 +0000 (18:47 +0000)]

Merge "Merge "Fix ContentObserver unregister issue" am: 09b6988e27 am: 481d92c517 am: aee5787b48 am: 16ff7bc82a"

commit | commitdiff | tree

Fyodor Kupolov [Thu, 6 Jul 2017 18:47:19 +0000 (18:47 +0000)]

Merge "Fix ContentObserver unregister issue" am: 09b6988e27 am: 481d92c517 am: aee5787b48
am: 16ff7bc82a

Change-Id: Id82a5e5c874c6fe4a24d5e3f9b095f208fc60533

commit | commitdiff | tree

TreeHugger Robot [Thu, 6 Jul 2017 18:47:00 +0000 (18:47 +0000)]

Merge "Include value of allowBackup in "dumpsys wallpaper""

commit | commitdiff | tree

Fyodor Kupolov [Thu, 6 Jul 2017 18:46:54 +0000 (18:46 +0000)]

Merge "Fix ContentObserver unregister issue" am: 09b6988e27 am: 481d92c517 am: aee5787b48
am: 16ff7bc82a

Change-Id: Icf006b580ff47125e992fd208a89b909dd53e639

commit | commitdiff | tree

Fyodor Kupolov [Thu, 6 Jul 2017 18:41:48 +0000 (18:41 +0000)]

Merge "Merge "Merge "Fix ContentObserver unregister issue" am: 09b6988e27" into stage-aosp-master am: 785ab04d7a" into oc-dev-plus-aosp
am: d6bb9401eb

Change-Id: Ie879dcf1b443563f5e3e55e15eb0dca8670d325d

commit | commitdiff | tree

Fyodor Kupolov [Thu, 6 Jul 2017 18:40:20 +0000 (18:40 +0000)]

Merge "Merge "Merge "Fix ContentObserver unregister issue" am: 09b6988e27" into stage-aosp-master am: 785ab04d7a" into oc-dev-plus-aosp
am: f035f800b7

Change-Id: I4cd47fea5a6e32d166295374ce3e5a898fe57110

commit | commitdiff | tree

Fyodor Kupolov [Thu, 6 Jul 2017 18:38:57 +0000 (18:38 +0000)]

Merge "Merge "Fix ContentObserver unregister issue" am: 09b6988e27 am: 481d92c517" into oc-dev-plus-aosp
am: 6c6b3820f7

Change-Id: Ic03a469684e57e6c703d55cef69bedd6eabd1664

commit | commitdiff | tree

Fyodor Kupolov [Thu, 6 Jul 2017 18:37:34 +0000 (18:37 +0000)]

Merge "Fix ContentObserver unregister issue" am: 09b6988e27 am: 481d92c517
am: aee5787b48

Change-Id: I6cbd47b7158d5ccd207c0ce57ca613ebc7822b5f

commit | commitdiff | tree

Android Build Merger (Role) [Thu, 6 Jul 2017 18:33:42 +0000 (18:33 +0000)]

Merge "Merge "Merge "Fix ContentObserver unregister issue" am: 09b6988e27" into stage-aosp-master am: 785ab04d7a" into oc-dev-plus-aosp

commit | commitdiff | tree

Android Build Merger (Role) [Thu, 6 Jul 2017 18:33:32 +0000 (18:33 +0000)]

Merge "Merge "Merge "Fix ContentObserver unregister issue" am: 09b6988e27" into stage-aosp-master am: 785ab04d7a" into oc-dev-plus-aosp

commit | commitdiff | tree

Fyodor Kupolov [Thu, 6 Jul 2017 18:32:42 +0000 (18:32 +0000)]

Merge "Merge "Fix ContentObserver unregister issue" am: 09b6988e27" into stage-aosp-master
am: 785ab04d7a

Change-Id: I3f75c0bd9928013ce04b86a93e16f43eacb3a588

commit | commitdiff | tree

Fyodor Kupolov [Thu, 6 Jul 2017 18:32:37 +0000 (18:32 +0000)]

Merge "Merge "Fix ContentObserver unregister issue" am: 09b6988e27" into stage-aosp-master
am: 785ab04d7a

Change-Id: I63d56be90cdf022d01fa2bf4b79d228f48e19eb1

commit | commitdiff | tree

Android Build Merger (Role) [Thu, 6 Jul 2017 18:32:12 +0000 (18:32 +0000)]

Merge "Merge "Fix ContentObserver unregister issue" am: 09b6988e27 am: 481d92c517" into oc-dev-plus-aosp

commit | commitdiff | tree

Fyodor Kupolov [Thu, 6 Jul 2017 18:31:14 +0000 (18:31 +0000)]

Merge "Fix ContentObserver unregister issue" am: 09b6988e27
am: 481d92c517

Change-Id: Icad1a472602443fe5a4931cf6181411e15b4c68f

commit | commitdiff | tree

Fyodor Kupolov [Thu, 6 Jul 2017 18:30:44 +0000 (18:30 +0000)]

Merge "Fix ContentObserver unregister issue" am: 09b6988e27
am: 481d92c517

Change-Id: I2f6cfe7465a9816815172db2fb3defa8f49bdd31

commit | commitdiff | tree

Daniel Nishi [Thu, 6 Jul 2017 18:29:53 +0000 (18:29 +0000)]

Merge "Add a Setting for whether or not we have been disabled by policy."

commit | commitdiff | tree

Android Build Merger (Role) [Thu, 6 Jul 2017 18:23:57 +0000 (18:23 +0000)]

Merge "Merge "Fix ContentObserver unregister issue" am: 09b6988e27" into stage-aosp-master

commit | commitdiff | tree

Fyodor Kupolov [Thu, 6 Jul 2017 18:22:49 +0000 (18:22 +0000)]

Merge "Fix ContentObserver unregister issue"
am: 09b6988e27

Change-Id: Ia9573b2cb453d3ff493a691675bee0f5dfc44396

commit | commitdiff | tree

Fyodor Kupolov [Thu, 6 Jul 2017 18:21:54 +0000 (18:21 +0000)]

Merge "Fix ContentObserver unregister issue"
am: 09b6988e27

Change-Id: I242e87b53f603a05ba7c4069662456457a3d980a

commit | commitdiff | tree

Android Build Merger (Role) [Thu, 6 Jul 2017 18:18:58 +0000 (18:18 +0000)]

Merge "Merge "Merge "Password field colors" into oc-dr1-dev am: e21a151fe7" into oc-dr1-dev-plus-aosp am: 8d1471aebe"

commit | commitdiff | tree

Lucas Dupin [Thu, 6 Jul 2017 18:17:19 +0000 (18:17 +0000)]

Merge "Merge "Password field colors" into oc-dr1-dev am: e21a151fe7" into oc-dr1-dev-plus-aosp
am: 8d1471aebe

Change-Id: I04fb9e7ca25320454f9a51b45a4cbe3931908d18

commit | commitdiff | tree

Android Build Merger (Role) [Thu, 6 Jul 2017 18:16:41 +0000 (18:16 +0000)]

Merge "Merge "Password field colors" into oc-dr1-dev am: e21a151fe7 am: 1ea58e5016"

commit | commitdiff | tree

Scott Randolph [Thu, 6 Jul 2017 18:16:27 +0000 (18:16 +0000)]

Merge "Fix typo in AudioPolicy comments"

commit | commitdiff | tree

Lucas Dupin [Thu, 6 Jul 2017 18:15:07 +0000 (18:15 +0000)]

Merge "Password field colors" into oc-dr1-dev am: e21a151fe7
am: 1ea58e5016

Change-Id: I9e0551fc0ec8d17fa92f9e40679b2c2956566f97

commit | commitdiff | tree

Android Build Merger (Role) [Thu, 6 Jul 2017 18:14:31 +0000 (18:14 +0000)]

Merge "Merge "Merge "AOD: Skip window animations while dozing" into oc-dr1-dev am: 92b6b7090c" into oc-dr1-dev-plus-aosp am: d88cfb5345"

commit | commitdiff | tree

Adrian Roos [Thu, 6 Jul 2017 18:13:25 +0000 (18:13 +0000)]

Merge "Merge "AOD: Skip window animations while dozing" into oc-dr1-dev am: 92b6b7090c" into oc-dr1-dev-plus-aosp
am: d88cfb5345

Change-Id: I3dd45ecf89eedafcc99707b99b77ab7448532d1f

commit | commitdiff | tree

Adrian Roos [Thu, 6 Jul 2017 18:10:37 +0000 (18:10 +0000)]

Merge "Merge "AOD: Skip window animations while dozing" into oc-dr1-dev am: 92b6b7090c" into oc-dr1-dev-plus-aosp
am: d88cfb5345

Change-Id: I7419f044c4f2c3b04b10b563661a4984496043d6

commit | commitdiff | tree

Adrian Roos [Thu, 6 Jul 2017 18:08:36 +0000 (18:08 +0000)]

Merge "AOD: Skip window animations while dozing" into oc-dr1-dev am: 92b6b7090c
am: fd9d88beb3

Change-Id: I76a5fdc6db9a849eeacf47278391e5d7eae53fc2

commit | commitdiff | tree

Android Build Merger (Role) [Thu, 6 Jul 2017 18:08:32 +0000 (18:08 +0000)]

Merge "Merge "Password field colors" into oc-dr1-dev am: e21a151fe7" into oc-dr1-dev-plus-aosp

commit | commitdiff | tree

Lucas Dupin [Thu, 6 Jul 2017 18:07:42 +0000 (18:07 +0000)]

Merge "Password field colors" into oc-dr1-dev
am: e21a151fe7

Change-Id: I1b0ba8bb0cfcc5a5b7002242f134873682decf7b

commit | commitdiff | tree

Lucas Dupin [Thu, 6 Jul 2017 18:07:09 +0000 (18:07 +0000)]

Merge "Password field colors" into oc-dr1-dev
am: e21a151fe7

Change-Id: I71a11428363e20474f7bed44da68bd01e39fb3de

commit | commitdiff | tree

Fyodor Kupolov [Thu, 6 Jul 2017 18:07:04 +0000 (18:07 +0000)]

Merge "Fix ContentObserver unregister issue"

commit | commitdiff | tree

Android Build Merger (Role) [Thu, 6 Jul 2017 18:04:09 +0000 (18:04 +0000)]

Merge "Merge "AOD: Skip window animations while dozing" into oc-dr1-dev am: 92b6b7090c" into oc-dr1-dev-plus-aosp

commit | commitdiff | tree

Adrian Roos [Thu, 6 Jul 2017 18:03:11 +0000 (18:03 +0000)]

Merge "AOD: Skip window animations while dozing" into oc-dr1-dev
am: 92b6b7090c

Change-Id: If0fc6ed0c95587114df1e7f8950fb0df99812ae2

commit | commitdiff | tree

TreeHugger Robot [Thu, 6 Jul 2017 18:02:47 +0000 (18:02 +0000)]

Merge "Password field colors" into oc-dr1-dev

commit | commitdiff | tree

Adrian Roos [Thu, 6 Jul 2017 18:02:30 +0000 (18:02 +0000)]

Merge "AOD: Skip window animations while dozing" into oc-dr1-dev
am: 92b6b7090c

Change-Id: I834761678ad26b66ac3e3b93a1398d9fce5e0f6c

commit | commitdiff | tree

TreeHugger Robot [Thu, 6 Jul 2017 17:53:24 +0000 (17:53 +0000)]

Merge "AOD: Skip window animations while dozing" into oc-dr1-dev

commit | commitdiff | tree

Android Build Merger (Role) [Thu, 6 Jul 2017 17:31:33 +0000 (17:31 +0000)]

Merge "Merge "Merge "Change visibility on formatPercentage(double)." into oc-dr1-dev am: 25937550af" into oc-dr1-dev-plus-aosp am: 5ecc5b10c2"

commit | commitdiff | tree

Android Build Merger (Role) [Thu, 6 Jul 2017 17:31:07 +0000 (17:31 +0000)]

Merge "Merge "Merge "Change visibility on formatPercentage(double)." into oc-dr1-dev am: 25937550af" into oc-dr1-dev-plus-aosp am: 5ecc5b10c2"

commit | commitdiff | tree

Daniel Nishi [Thu, 6 Jul 2017 17:29:37 +0000 (17:29 +0000)]

Merge "Merge "Change visibility on formatPercentage(double)." into oc-dr1-dev am: 25937550af" into oc-dr1-dev-plus-aosp
am: 5ecc5b10c2

Change-Id: Ic691721550e538fffa79081aaa98e86001e13366

commit | commitdiff | tree

Daniel Nishi [Thu, 6 Jul 2017 17:29:28 +0000 (17:29 +0000)]

Merge "Merge "Change visibility on formatPercentage(double)." into oc-dr1-dev am: 25937550af" into oc-dr1-dev-plus-aosp
am: 5ecc5b10c2

Change-Id: I1e55bfe47fffaa70f45a831e622dbbede56a65dc

commit | commitdiff | tree

Android Build Merger (Role) [Thu, 6 Jul 2017 17:29:11 +0000 (17:29 +0000)]

Merge "Merge "Change visibility on formatPercentage(double)." into oc-dr1-dev am: 25937550af am: cda8602d8c"

commit | commitdiff | tree

Daniel Nishi [Thu, 6 Jul 2017 17:27:09 +0000 (17:27 +0000)]

Merge "Change visibility on formatPercentage(double)." into oc-dr1-dev am: 25937550af
am: cda8602d8c

Change-Id: Ib3325eb9dab4f2f516075ee70678b2250e74e788

commit | commitdiff | tree

Daniel Nishi [Thu, 6 Jul 2017 17:26:57 +0000 (17:26 +0000)]

Merge "Change visibility on formatPercentage(double)." into oc-dr1-dev am: 25937550af
am: cda8602d8c

Change-Id: I8a24fd2350c2d9731ab6825199fffc8ac77784cf

commit | commitdiff | tree

Android Build Merger (Role) [Thu, 6 Jul 2017 17:19:58 +0000 (17:19 +0000)]

Merge "Merge "Merge "Broadcast only if boot complete" into oc-dr1-dev am: b60c48a6a2" into oc-dr1-dev-plus-aosp am: 7ebf4d91e5"

commit | commitdiff | tree

Android Build Merger (Role) [Thu, 6 Jul 2017 17:19:46 +0000 (17:19 +0000)]

Merge "Merge "Merge "Broadcast only if boot complete" into oc-dr1-dev am: b60c48a6a2" into oc-dr1-dev-plus-aosp am: 7ebf4d91e5"

commit | commitdiff | tree

Android Build Merger (Role) [Thu, 6 Jul 2017 17:18:55 +0000 (17:18 +0000)]

Merge "Merge "Change visibility on formatPercentage(double)." into oc-dr1-dev am: 25937550af" into oc-dr1-dev-plus-aosp

commit | commitdiff | tree

Jerry Zhang [Thu, 6 Jul 2017 17:18:51 +0000 (17:18 +0000)]

Merge "Merge "Broadcast only if boot complete" into oc-dr1-dev am: b60c48a6a2" into oc-dr1-dev-plus-aosp
am: 7ebf4d91e5

Change-Id: I766cacd5af61feb15bed445f8cc073e713a922ba

commit | commitdiff | tree

Jerry Zhang [Thu, 6 Jul 2017 17:18:38 +0000 (17:18 +0000)]

Merge "Merge "Broadcast only if boot complete" into oc-dr1-dev am: b60c48a6a2" into oc-dr1-dev-plus-aosp
am: 7ebf4d91e5

Change-Id: I4e585ae2d71c391fd0831a129a2bb53f929cf439

commit | commitdiff | tree

Android Build Merger (Role) [Thu, 6 Jul 2017 17:18:21 +0000 (17:18 +0000)]

Merge "Merge "Broadcast only if boot complete" into oc-dr1-dev am: b60c48a6a2 am: 4501186a6c"

commit | commitdiff | tree

Jerry Zhang [Thu, 6 Jul 2017 17:17:25 +0000 (17:17 +0000)]

Merge "Broadcast only if boot complete" into oc-dr1-dev am: b60c48a6a2
am: 4501186a6c

Change-Id: Ia8cdf4bb74d766d131eaab1763f1a6d12aa9ed20

commit | commitdiff | tree

Daniel Nishi [Thu, 6 Jul 2017 17:17:11 +0000 (17:17 +0000)]

Merge "Change visibility on formatPercentage(double)." into oc-dr1-dev
am: 25937550af

Change-Id: If4b01fcf9e984546f9242446dcb3d02efe4725af

commit | commitdiff | tree

Jerry Zhang [Thu, 6 Jul 2017 17:17:02 +0000 (17:17 +0000)]

Merge "Broadcast only if boot complete" into oc-dr1-dev am: b60c48a6a2
am: 4501186a6c

Change-Id: Ib65430aa0ff6a115fcd867fc6c8c0e4e7d9a03fc

commit | commitdiff | tree

Daniel Nishi [Thu, 6 Jul 2017 17:15:24 +0000 (17:15 +0000)]

Merge "Change visibility on formatPercentage(double)." into oc-dr1-dev
am: 25937550af

Change-Id: I53435cc58c29fd72cecca91e730cbfd745c35ef6

commit | commitdiff | tree

Android Build Merger (Role) [Thu, 6 Jul 2017 17:12:04 +0000 (17:12 +0000)]

Merge "Merge "Broadcast only if boot complete" into oc-dr1-dev am: b60c48a6a2" into oc-dr1-dev-plus-aosp

commit | commitdiff | tree

Jerry Zhang [Thu, 6 Jul 2017 17:10:55 +0000 (17:10 +0000)]

Merge "Broadcast only if boot complete" into oc-dr1-dev
am: b60c48a6a2

Change-Id: I53d2958b56ee6b48457741268e8578dc3316091c

commit | commitdiff | tree

Jerry Zhang [Thu, 6 Jul 2017 17:10:40 +0000 (17:10 +0000)]

Merge "Broadcast only if boot complete" into oc-dr1-dev
am: b60c48a6a2

Change-Id: I99f2ec3d45fa69be68aa52aa769929645f8432cf

commit | commitdiff | tree

Doris Ling [Thu, 6 Jul 2017 17:09:11 +0000 (17:09 +0000)]

Merge "Update the max height/width attribute of the TwoTargetPreference icon."

commit | commitdiff | tree

Daniel Nishi [Thu, 6 Jul 2017 17:04:59 +0000 (17:04 +0000)]

Merge "Change visibility on formatPercentage(double)." into oc-dr1-dev

commit | commitdiff | tree

Android Build Merger (Role) [Thu, 6 Jul 2017 17:02:12 +0000 (17:02 +0000)]

Merge "Merge "AOD: Disable if device is not yet provisioned" into oc-dr1-dev am: 789f10fe12 am: e510562e75"

commit | commitdiff | tree

Android Build Merger (Role) [Thu, 6 Jul 2017 17:02:00 +0000 (17:02 +0000)]

Merge "Merge "AOD: Disable if device is not yet provisioned" into oc-dr1-dev am: 789f10fe12 am: e510562e75"

commit | commitdiff | tree

Adrian Roos [Thu, 6 Jul 2017 17:01:11 +0000 (17:01 +0000)]

Merge "AOD: Disable if device is not yet provisioned" into oc-dr1-dev am: 789f10fe12
am: e510562e75

Change-Id: Ibc40e0723c73f899510a6f1299bdda914a42cb58

commit | commitdiff | tree

Adrian Roos [Thu, 6 Jul 2017 17:01:00 +0000 (17:01 +0000)]

Merge "AOD: Disable if device is not yet provisioned" into oc-dr1-dev am: 789f10fe12
am: e510562e75

Change-Id: Idb953e1b1a1b574e433d90d2f92b1a96c33808f1

commit | commitdiff | tree

Rubin Xu [Thu, 6 Jul 2017 17:00:31 +0000 (17:00 +0000)]

Merge "Add more javadoc to ConnectEvent and DnsEvent"

commit | commitdiff | tree

Android Build Merger (Role) [Thu, 6 Jul 2017 16:56:39 +0000 (16:56 +0000)]

Merge "Merge "Merge "Revert "Default Trust Agents are now always enforced."" into oc-dr1-dev am: 9731c8bfef" into oc-dr1-dev-plus-aosp am: f79a7cddff"

commit | commitdiff | tree

Android Build Merger (Role) [Thu, 6 Jul 2017 16:55:46 +0000 (16:55 +0000)]

Merge "Merge "Merge "Revert "Default Trust Agents are now always enforced."" into oc-dr1-dev am: 9731c8bfef" into oc-dr1-dev-plus-aosp am: f79a7cddff"

commit | commitdiff | tree

Adrian Roos [Thu, 6 Jul 2017 16:54:37 +0000 (16:54 +0000)]

Merge "Merge "Revert "Default Trust Agents are now always enforced."" into oc-dr1-dev am: 9731c8bfef" into oc-dr1-dev-plus-aosp
am: f79a7cddff

Change-Id: I2857045d95705b00f96cd5cdb69b3fea0cfb1f8d

commit | commitdiff | tree

Adrian Roos [Thu, 6 Jul 2017 16:54:32 +0000 (16:54 +0000)]

Merge "Merge "Revert "Default Trust Agents are now always enforced."" into oc-dr1-dev am: 9731c8bfef" into oc-dr1-dev-plus-aosp
am: f79a7cddff

Change-Id: I97f4019f72e99439a2ffe1518f04303f223a873b

commit | commitdiff | tree

Android Build Merger (Role) [Thu, 6 Jul 2017 16:54:14 +0000 (16:54 +0000)]

Merge "Merge "Revert "Default Trust Agents are now always enforced."" into oc-dr1-dev am: 9731c8bfef am: 7ba5f8e2ec"

commit | commitdiff | tree

Android Build Merger (Role) [Thu, 6 Jul 2017 16:54:03 +0000 (16:54 +0000)]

Merge "Merge "Revert "Default Trust Agents are now always enforced."" into oc-dr1-dev am: 9731c8bfef am: 7ba5f8e2ec"

commit | commitdiff | tree

Adrian Roos [Thu, 6 Jul 2017 16:53:14 +0000 (16:53 +0000)]

Merge "Revert "Default Trust Agents are now always enforced."" into oc-dr1-dev am: 9731c8bfef
am: 7ba5f8e2ec

Change-Id: I0eed02ecb97c5908b28516c139b4c483cdff4841

commit | commitdiff | tree

Android Build Merger (Role) [Thu, 6 Jul 2017 16:52:50 +0000 (16:52 +0000)]

Merge "Merge "Merge "Fix tests?" into oc-dr1-dev am: f22c79a27b" into oc-dr1-dev-plus-aosp am: 5b0a2266bf"

commit | commitdiff | tree

Adrian Roos [Thu, 6 Jul 2017 16:52:45 +0000 (16:52 +0000)]

Merge "Revert "Default Trust Agents are now always enforced."" into oc-dr1-dev am: 9731c8bfef
am: 7ba5f8e2ec

Change-Id: Ic34bdbb938bf623b8fbc94d93c102046c44e6df5

commit | commitdiff | tree

Android Build Merger (Role) [Thu, 6 Jul 2017 16:52:06 +0000 (16:52 +0000)]

Merge "Merge "Merge "Fix tests?" into oc-dr1-dev am: f22c79a27b" into oc-dr1-dev-plus-aosp am: 5b0a2266bf"

commit | commitdiff | tree

Jerry Zhang [Thu, 6 Jul 2017 16:52:04 +0000 (16:52 +0000)]

Merge "Broadcast only if boot complete" into oc-dr1-dev

commit | commitdiff | tree

Jason Monk [Thu, 6 Jul 2017 16:51:16 +0000 (16:51 +0000)]

Merge "Merge "Fix tests?" into oc-dr1-dev am: f22c79a27b" into oc-dr1-dev-plus-aosp
am: 5b0a2266bf

Change-Id: I1fdcd49cb75c5b7a9cc10c655dcc486a849688e2

commit | commitdiff | tree

Jason Monk [Thu, 6 Jul 2017 16:51:00 +0000 (16:51 +0000)]

Merge "Merge "Fix tests?" into oc-dr1-dev am: f22c79a27b" into oc-dr1-dev-plus-aosp
am: 5b0a2266bf

Change-Id: I1f680d72b6a2d7730e081574aaac04f5e802c831

commit | commitdiff | tree

Android Build Merger (Role) [Thu, 6 Jul 2017 16:50:48 +0000 (16:50 +0000)]

Merge "Merge "Merge "Fix tests?" into oc-dr1-dev am: f22c79a27b" into oc-dr1-dev-plus-aosp am: 16670ea2ae"

commit | commitdiff | tree

Android Build Merger (Role) [Thu, 6 Jul 2017 16:50:32 +0000 (16:50 +0000)]

Merge "Merge "Merge "Fix tests?" into oc-dr1-dev am: f22c79a27b" into oc-dr1-dev-plus-aosp am: 16670ea2ae"

commit | commitdiff | tree

Jason Monk [Thu, 6 Jul 2017 16:49:37 +0000 (16:49 +0000)]

Merge "Merge "Fix tests?" into oc-dr1-dev am: f22c79a27b" into oc-dr1-dev-plus-aosp
am: 16670ea2ae

Change-Id: Ifce815fa63555077491847c4c2f24bf1da275210

commit | commitdiff | tree

Jason Monk [Thu, 6 Jul 2017 16:49:22 +0000 (16:49 +0000)]

Merge "Merge "Fix tests?" into oc-dr1-dev am: f22c79a27b" into oc-dr1-dev-plus-aosp
am: 16670ea2ae

Change-Id: Ic5797fd2047010ee054b7aff199f490569efa3f3

commit | commitdiff | tree

Android Build Merger (Role) [Thu, 6 Jul 2017 16:49:03 +0000 (16:49 +0000)]

Merge "Merge "Merge "LockIcon: Initialize mAccessibilityController" into oc-dr1-dev am: c3fef742c0" into oc-dr1-dev-plus-aosp am: b91e635fa4"

commit | commitdiff | tree

Android Build Merger (Role) [Thu, 6 Jul 2017 16:48:48 +0000 (16:48 +0000)]

Merge "Merge "Merge "LockIcon: Initialize mAccessibilityController" into oc-dr1-dev am: c3fef742c0" into oc-dr1-dev-plus-aosp am: b91e635fa4"

commit | commitdiff | tree

Adrian Roos [Thu, 6 Jul 2017 16:47:43 +0000 (16:47 +0000)]

Merge "Merge "LockIcon: Initialize mAccessibilityController" into oc-dr1-dev am: c3fef742c0" into oc-dr1-dev-plus-aosp
am: b91e635fa4

Change-Id: Ic3f3c67dee73dd4b23e47853083e4cbf604564bf

commit | commitdiff | tree

Adrian Roos [Thu, 6 Jul 2017 16:47:26 +0000 (16:47 +0000)]

Merge "Merge "LockIcon: Initialize mAccessibilityController" into oc-dr1-dev am: c3fef742c0" into oc-dr1-dev-plus-aosp
am: b91e635fa4

Change-Id: Ic6337edf70a55cc4141dfe70e92565cd73b661d1

commit | commitdiff | tree

Android Build Merger (Role) [Thu, 6 Jul 2017 16:47:12 +0000 (16:47 +0000)]

Merge "Merge "Merge "LockIcon: Initialize mAccessibilityController" into oc-dr1-dev am: c3fef742c0" into oc-dr1-dev-plus-aosp am: a37d44df8f"

commit | commitdiff | tree

Android Build Merger (Role) [Thu, 6 Jul 2017 16:46:44 +0000 (16:46 +0000)]

Merge "Merge "Merge "LockIcon: Initialize mAccessibilityController" into oc-dr1-dev am: c3fef742c0" into oc-dr1-dev-plus-aosp am: a37d44df8f"

commit | commitdiff | tree

Adrian Roos [Thu, 6 Jul 2017 16:46:02 +0000 (16:46 +0000)]

Merge "Merge "LockIcon: Initialize mAccessibilityController" into oc-dr1-dev am: c3fef742c0" into oc-dr1-dev-plus-aosp
am: a37d44df8f

Change-Id: I472fb2852dcb6d01bfd84fcccda72ae18a0a4c76

commit | commitdiff | tree

Adrian Roos [Thu, 6 Jul 2017 16:45:49 +0000 (16:45 +0000)]

Merge "Merge "LockIcon: Initialize mAccessibilityController" into oc-dr1-dev am: c3fef742c0" into oc-dr1-dev-plus-aosp
am: a37d44df8f

Change-Id: I79bc12ce0c1333ceeefa233acd17088550c08aca

commit | commitdiff | tree

Android Build Merger (Role) [Thu, 6 Jul 2017 16:45:33 +0000 (16:45 +0000)]

Merge "Merge "Merge "Don't animate grayscale if animations are off" into oc-dr1-dev am: ab7af71c64" into oc-dr1-dev-plus-aosp am: 763c1d1e24"

commit | commitdiff | tree

Android Build Merger (Role) [Thu, 6 Jul 2017 16:45:08 +0000 (16:45 +0000)]

Merge "Merge "Merge "Don't animate grayscale if animations are off" into oc-dr1-dev am: ab7af71c64" into oc-dr1-dev-plus-aosp am: 763c1d1e24"

commit | commitdiff | tree

Evan Laird [Thu, 6 Jul 2017 16:44:16 +0000 (16:44 +0000)]

Merge "Merge "Don't animate grayscale if animations are off" into oc-dr1-dev am: ab7af71c64" into oc-dr1-dev-plus-aosp
am: 763c1d1e24

Change-Id: I1705d3d1a3eed04689c72bd83251037ebda11d6f

commit | commitdiff | tree

Evan Laird [Thu, 6 Jul 2017 16:44:14 +0000 (16:44 +0000)]

Merge "Merge "Don't animate grayscale if animations are off" into oc-dr1-dev am: ab7af71c64" into oc-dr1-dev-plus-aosp
am: 763c1d1e24

Change-Id: I78fe9027d1af153226243290e7461a09544d88c1

commit | commitdiff | tree

Android Build Merger (Role) [Thu, 6 Jul 2017 16:43:39 +0000 (16:43 +0000)]

Merge "Merge "Merge "Don't animate grayscale if animations are off" into oc-dr1-dev am: ab7af71c64" into oc-dr1-dev-plus-aosp am: 4a17866abe"

commit | commitdiff | tree

Android Build Merger (Role) [Thu, 6 Jul 2017 16:43:24 +0000 (16:43 +0000)]

Merge "Merge "Merge "Don't animate grayscale if animations are off" into oc-dr1-dev am: ab7af71c64" into oc-dr1-dev-plus-aosp am: 4a17866abe"