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

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

Change-Id: I5a2e0b4c4f4d91a1618ba6ad4f848b3ccf98a5a0