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)
am: 8a893de625  -s ours

Change-Id: I7407e2dd2411bc519a5499cf74c284c3fb74bdf0


Trivial merge