commit | ef2dab9216ac2e3f746122b98cd1e10d1988dec0 | [log] [tgz] |
---|---|---|
author | Adrian Roos <roosa@google.com> | Tue Jul 25 18:08:07 2017 +0000 |
committer | android-build-merger <android-build-merger@google.com> | Tue Jul 25 18:08:07 2017 +0000 |
tree | 83e302c00b4eca53258754a95bb0b82228405ea6 | |
parent | d438a3d18b99e3083679754c31f863a5320d6aca [diff] | |
parent | 512b6bade26b8fb13c3ee3c4cdc1e00b1d5eb196 [diff] |
Merge "Merge "AOD: Show keyguard indications in white" into oc-dr1-dev am: ec05633f5f am: 1a68d64e68" into oc-mr1-dev-plus-aosp am: 512b6bade2 Change-Id: I154b46a444c3c9bf967eda4d9bebd756f1baff78