OSDN Git Service

DO NOT MERGE Updating security string to 2016-07-05 am: f885e95375 am: 555c5af89a...
authorZach Jang <zachjang@google.com>
Wed, 25 May 2016 20:52:58 +0000 (20:52 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Wed, 25 May 2016 20:52:58 +0000 (20:52 +0000)
am: 6a974cf124  -s ours

* commit '6a974cf124727c19496f202576b7520cd22175d1':
  DO NOT MERGE Updating security string to 2016-07-05

Change-Id: I268b1e3d67c2b8cf579c5b88d582ab3b93592aec


Trivial merge