| commit | d438a3d18b99e3083679754c31f863a5320d6aca | [log] [tgz] |
|---|---|---|
| author | Adrian Roos <roosa@google.com> | Tue Jul 25 18:05:44 2017 +0000 |
| committer | android-build-merger <android-build-merger@google.com> | Tue Jul 25 18:05:44 2017 +0000 |
| tree | 83e302c00b4eca53258754a95bb0b82228405ea6 | |
| parent | 887f092fa0d09e3b39d85e0ae9fa9e2338fd6049 [diff] | |
| parent | ef3fb5c6332b2303443894a9bdd13a3e4f2f2ec5 [diff] |
Merge "Merge "AOD: Show keyguard indications in white" into oc-dr1-dev am: ec05633f5f am: bbef8631d8" into oc-mr1-dev-plus-aosp am: ef3fb5c633 Change-Id: Ie565e03e52ba8c2aa281b74781f3a12e4c1e8441