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:27:05 +0000 (19:27 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Fri, 19 May 2017 19:27:05 +0000 (19:27 +0000)
commit3f5593376d9105af3fbe4553b6cece09778f5e62
treeca10ef1001d9e1066979d878f9238fdb01d6d182
parentad860c3d0d1bfaba9f8344c4a587699ad9ea16fa
parent535ade48f8ec8ba8cc30f153ae4bd5272bed39c7
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 am: 16dcd532a0
am: 535ade48f8

Change-Id: I3c084d863cb3b091c0e7ebf7783969c9c7125fa1