OSDN Git Service

[automerger skipped] Merge "[DO NOT MERGE] Update P light greylist in AOSP" am: 21593...
authorDavid Brazdil <dbrazdil@google.com>
Wed, 18 Jul 2018 13:14:52 +0000 (06:14 -0700)
committerandroid-build-merger <android-build-merger@google.com>
Wed, 18 Jul 2018 13:14:52 +0000 (06:14 -0700)
am: 2abea6bc94  -s ours

Change-Id: Ifc02a70713a1dcaad612ec99684b60ce9dc12c7c


Trivial merge