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:25:36 +0000 (19:25 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Fri, 19 May 2017 19:25:36 +0000 (19:25 +0000)
commit535ade48f8ec8ba8cc30f153ae4bd5272bed39c7
tree938f290adffafa26f067732d9aa4a1a900fd94e9
parent7d58605e6b039ff4ea61aa8cdc656d97f59daa55
parent16dcd532a01bd0718ad0a54ed3a8efb86b3ef05a
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

Change-Id: Ic6b017fd04b00a2cf65336e76386d94cabc8b13a