OSDN Git Service

Merge "Color of the ring around the lock icon" into oc-dr1-dev
authorLucas Dupin <dupin@google.com>
Fri, 7 Jul 2017 02:49:09 +0000 (02:49 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Fri, 7 Jul 2017 02:49:09 +0000 (02:49 +0000)
commitfec36c27f2368725970395f6c9f0fb2e3e0a5c13
tree93b6277d2c0ea97b841b84c6ffd99250d15747f4
parent6e7e4ed0247897223e93b076ec109dc7e2eafcae
parent0903e31e724ea7466fc147bde6bc0d1cbcb75e31
Merge "Color of the ring around the lock icon" into oc-dr1-dev
am: 0903e31e72

Change-Id: I4cb8d6e0987543fa9e189c508398ba70d683064d