OSDN Git Service

Merge "Merge "Set security update label in framework" into nyc-dev am: 8ebedfd0d9...
authorTianjie Xu <xunchang@google.com>
Mon, 2 May 2016 18:06:09 +0000 (18:06 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Mon, 2 May 2016 18:06:09 +0000 (18:06 +0000)
am: 08cfbca904

* commit '08cfbca904b637b8518a89532f13ee49f9c91d38':

Change-Id: Ib64cdcb289508608e707b639bc3dc1e38f07e498


Trivial merge