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:14:34 +0000 (19:14 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Fri, 19 May 2017 19:14:34 +0000 (19:14 +0000)
commit0a97d3f909a29468f4de75242ba42200deb93b64
treef67d13e5564615347fec8baec709cc1745dc1151
parenta871e8ff81e6f60597b0a672ce8d483b9180c9cd
parent18fc68549bf0259a8187c8d160813ebd485dd87a
Merge "[DO NOT MERGE] Updating security string to 2017-07-01 in lmp-dev bug:38342695" into lmp-dev
am: 18fc68549b  -s ours

Change-Id: Ib3882885ecaf352fc96578de1e5b12e1ae23a8c8