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:20 +0000 (18:06 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Mon, 2 May 2016 18:06:20 +0000 (18:06 +0000)
am: ad5513b217

* commit 'ad5513b2171eec8d9d1aafdc282ccef387406ab5':

Change-Id: Idddf315d64129898db4cd0387b8b593d28930da2


Trivial merge