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:27:37 +0000 (19:27 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Fri, 19 May 2017 19:27:37 +0000 (19:27 +0000)
commite10ce80409bd1a13a05ec1b5919e6dbc586e35fd
treeca10ef1001d9e1066979d878f9238fdb01d6d182
parent3f5593376d9105af3fbe4553b6cece09778f5e62
parent1899a63f1d804693e876d1fb2ce451c0713d6ac1
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 am: 5c7bac6231
am: 1899a63f1d

Change-Id: Ib018b81b77ca749333a4700049a525523e2f83c1