OSDN Git Service

Merge "Set security update label in framework" into nyc-dev am: 8ebedfd0d9
authorTianjie Xu <xunchang@google.com>
Mon, 2 May 2016 17:56:51 +0000 (17:56 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Mon, 2 May 2016 17:56:51 +0000 (17:56 +0000)
commita4a0f43b6efb1a845ee88c29f51c800a2071eb2d
tree334a2a79bc7bf96f55c7df0cf2360289cccf42b8
parent96784707c774162b8d603a674675bcfb3cc0ca5b
parent87a51a7a7f9fa913acb548fc1c18c54c66afc871
Merge "Set security update label in framework" into nyc-dev am: 8ebedfd0d9
am: 87a51a7a7f

* commit '87a51a7a7f9fa913acb548fc1c18c54c66afc871':
  Set security update label in framework

Change-Id: Ib25a7d8f1cdca143a12f28a451cf1947295e0e5f