tree 44039c2a20ca9d6d8c716971779221c22eb0a7ae
parent 09b8a6c35e5c780f4f052de0519b22438af0051a
parent 3d28a65d79046599ac04aa29c8e0aef5f6312700
author Lucas Dupin <dupin@google.com> 1501879910 +0000
committer android-build-merger <android-build-merger@google.com> 1501879910 +0000

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

Change-Id: I437c224fc8a54a608edd616c63f957c2cdadf665