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:29:29 +0000 (19:29 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Fri, 19 May 2017 19:29:29 +0000 (19:29 +0000)
commit6a94730d20cbd648e14e4efff7547b787e0661b9
tree869254a3f84d26e97f49de4c508e840083dfdff3
parent288fd15d69f13527d7de309696963d169106dfdc
parente10ce80409bd1a13a05ec1b5919e6dbc586e35fd
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
am: e10ce80409  -s ours

Change-Id: I62e3792b2aef5064d04d488c5ca631d0a0631e58