OSDN Git Service

Merge "Create new category for lock screen redaction" into oc-dr1-dev am: bacb9fc459
authorMaurice Lam <yukl@google.com>
Fri, 9 Jun 2017 17:20:16 +0000 (17:20 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Fri, 9 Jun 2017 17:20:16 +0000 (17:20 +0000)
am: a61192df26

Change-Id: Id9dca7989dafd788d1fb46ca7b28ca9c3f08072e


Trivial merge