OSDN Git Service

Merge "Add back protected profile availibility broadcasts." into nyc-dev am: cda5089...
authorRubin Xu <rubinxu@google.com>
Mon, 25 Apr 2016 18:20:03 +0000 (18:20 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Mon, 25 Apr 2016 18:20:03 +0000 (18:20 +0000)
commitbbd031f01380d003437473b40d967fb0998cb775
tree5ef8d8cf61e8c0bedb99b1df3a024b87eb2a8e44
parent4378b5e13353f4d33475881427a96f07aca160cc
parent4038a3a8a957db4d41eabfd4d3a49658790a72c8
Merge "Add back protected profile availibility broadcasts." into nyc-dev am: cda5089 am: f8a52ef
am: 4038a3a

* commit '4038a3a8a957db4d41eabfd4d3a49658790a72c8':
  Add back protected profile availibility broadcasts.

Change-Id: Ib3da0c9dee84b400343086949e086040e98ca0af
core/res/AndroidManifest.xml