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:14:57 +0000 (19:14 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Fri, 19 May 2017 19:14:57 +0000 (19:14 +0000)
commit4cfcc9fe7330fce5d9310533f3b08fb31f6f4000
treef67d13e5564615347fec8baec709cc1745dc1151
parent0a97d3f909a29468f4de75242ba42200deb93b64
parent11af5514dfad96a30be2972e65306268040e1e52
Merge "[DO NOT MERGE] Updating security string to 2017-07-05 on lmp-dev bug:38342695" into lmp-dev
am: 11af5514df  -s ours

Change-Id: If06ae105d14f94816787580e5146bfd38fc85126