OSDN Git Service

Merge "Fail if setProfileEnabled is called outside a managed profile." into nyc-dev
authorNicolas Prévot <nprevot@google.com>
Mon, 8 Feb 2016 14:14:06 +0000 (14:14 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Mon, 8 Feb 2016 14:14:06 +0000 (14:14 +0000)
commiteccbe69a556e10fa482fbf41c13b17d687962bb1
treed7e8e9d552ca7dda02a24e7bf5bf193db99799bc
parentd4da61ec845326e9800676351e979f1817bcd7e0
parente64f3da729ae6a00fb627f00b8a97e7c5feb8bcb
Merge "Fail if setProfileEnabled is called outside a managed profile." into nyc-dev
am: e64f3da729

* commit 'e64f3da729ae6a00fb627f00b8a97e7c5feb8bcb':
  Fail if setProfileEnabled is called outside a managed profile.