OSDN Git Service

Merge "[DO NOT MERGE] Updating security string to 2017-07-01 in lmp-dev bug:38342695...
authorAdam Seaton <aseaton@google.com>
Fri, 19 May 2017 19:22:05 +0000 (19:22 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Fri, 19 May 2017 19:22:05 +0000 (19:22 +0000)
commit16dcd532a01bd0718ad0a54ed3a8efb86b3ef05a
treec9b3711107026485db24275ba1978470232c401d
parent18e5f9b4f67c2b2c4a033a50a4a0f1f1234bdbcc
parent7ad3c1407c3e95a4950207a5fb7d4da04c131ebf
Merge "[DO NOT MERGE] Updating security string to 2017-07-01 in lmp-dev bug:38342695" into lmp-dev am: 18fc68549b  -s ours am: 0a97d3f909 am: ddac9519eb  -s ours
am: 7ad3c1407c

Change-Id: I8564bba5201302290fdca4d3350d0cbc7a97ac7b