tree 85149617bd920d1255ed888a42f0056ceeb01c29
parent 8db7136894db9b98bcaca9bc14f3a49c1f62eb2e
parent ff660190e28ee2476fa0fda3e1a67777f599e9c5
author Lucas Dupin <dupin@google.com> 1501879223 +0000
committer android-build-merger <android-build-merger@google.com> 1501879223 +0000

Merge "New keyguard icons" into oc-dr1-dev am: 6df24d2f42
am: ff660190e2

Change-Id: Ie4351214824d5a9ccce6a3e6f83bb24dedfa20f9