OSDN Git Service

Merge "[DO NOT MERGE] Updating Security String to 2017-09-05 Bug:63846344" into nyc...
authorAdam Seaton <aseaton@google.com>
Wed, 19 Jul 2017 22:18:15 +0000 (22:18 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Wed, 19 Jul 2017 22:18:15 +0000 (22:18 +0000)
am: 690b7e9091  -s ours

Change-Id: Iba622d08140b22ebdc0ec278b2b518bde15293bd


Trivial merge