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:22:26 +0000 (19:22 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Fri, 19 May 2017 19:22:26 +0000 (19:22 +0000)
commit5c7bac6231131fbc09f96f5409912122bc65ef1c
treec9b3711107026485db24275ba1978470232c401d
parent16dcd532a01bd0718ad0a54ed3a8efb86b3ef05a
parent9f169ddbcdcce4089857e8fb9e920979cb7d679c
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 am: 8a893de625  -s ours
am: 9f169ddbcd

Change-Id: I9d563934bf1454022707c9f55f4d97e92ce077d0