OSDN Git Service

Merge "Add managed profile setting page" into nyc-dev
authorTony Mak <tonymak@google.com>
Wed, 4 May 2016 09:41:58 +0000 (09:41 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Wed, 4 May 2016 09:41:58 +0000 (09:41 +0000)
commitb8cfa32bf1a91757002ce8e7dd7c134d9a57d6de
tree5422c4f9147824c9b04da6926bf614af72575947
parentbf78b8c221beefc4e75553fc3cc15110d4affc8b
parentd5b3a5d342d74411b0e4466541d5c5b1168eb803
Merge "Add managed profile setting page" into nyc-dev
am: d5b3a5d342

* commit 'd5b3a5d342d74411b0e4466541d5c5b1168eb803':
  Add managed profile setting page

Change-Id: I1ca66552fe44e7ace9ff7b314ab0f7af53ca1e6c