OSDN Git Service

Merge "[DO NOT MERGE] Updating Security String to 2017-09-01 Bug:63846344" into mnc...
authorAdam Seaton <aseaton@google.com>
Thu, 20 Jul 2017 21:34:15 +0000 (21:34 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Thu, 20 Jul 2017 21:34:15 +0000 (21:34 +0000)
am: a65c03517e  -s ours

Change-Id: I5ed187e174d8acfe59076da5af02b1135b1a9955


Trivial merge