OSDN Git Service

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

* commit '249eadf35e9bc709fb98b6ad9192c756d5c39188':

Change-Id: I26077ed2ae3b838965b24eac0c0e9e097346ce17


Trivial merge