OSDN Git Service

Merge "[DO NOT MERGE] Updating security string to 2017-07-05 on lmp-dev bug:38342695...
authorAdam Seaton <aseaton@google.com>
Fri, 19 May 2017 19:16:54 +0000 (19:16 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Fri, 19 May 2017 19:16:54 +0000 (19:16 +0000)
commit8a893de625f78032e534ef5b8191a8070d2a173e
tree8b4a2fef09b9338641085d2e0f4121e47c8d426f
parentddac9519ebc83b8ddc82b4d57b99058576d88a0d
parent4cfcc9fe7330fce5d9310533f3b08fb31f6f4000
Merge "[DO NOT MERGE] Updating security string to 2017-07-05 on lmp-dev bug:38342695" into lmp-dev am: 11af5514df  -s ours
am: 4cfcc9fe73

Change-Id: I2f513d397ae199b0ea334d2254ae00a73e0b8026