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:19:01 +0000 (19:19 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Fri, 19 May 2017 19:19:01 +0000 (19:19 +0000)
commit9f169ddbcdcce4089857e8fb9e920979cb7d679c
tree9fbb8a1df91324b02d45af046c2653336e5d3254
parent7ad3c1407c3e95a4950207a5fb7d4da04c131ebf
parent8a893de625f78032e534ef5b8191a8070d2a173e
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

Change-Id: I7407e2dd2411bc519a5499cf74c284c3fb74bdf0