OSDN Git Service

Merge "Set security update label in framework" into nyc-dev am: 8ebedfd0d9 am: 87a51a7a7f
authorTianjie Xu <xunchang@google.com>
Mon, 2 May 2016 18:01:42 +0000 (18:01 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Mon, 2 May 2016 18:01:42 +0000 (18:01 +0000)
commit4ca5415d01e6a9c2541cc1c83c6ec8e4abfc8e42
tree1863efebf6183b201a8a5c0091646f0b34a8acc9
parent7f67e96902d243e068da4089ac57b4c88c887d09
parenta4a0f43b6efb1a845ee88c29f51c800a2071eb2d
Merge "Set security update label in framework" into nyc-dev am: 8ebedfd0d9 am: 87a51a7a7f
am: a4a0f43b6e

* commit 'a4a0f43b6efb1a845ee88c29f51c800a2071eb2d':
  Set security update label in framework

Change-Id: I882f55e797a59bfdbd4f80c5c2f721e8e8f3be03