Tony Mak b8cfa32bf1 Merge "Add managed profile setting page" into nyc-dev ...

am: d5b3a5d342

* commit 'd5b3a5d342d74411b0e4466541d5c5b1168eb803':
  Add managed profile setting page

Change-Id: I1ca66552fe44e7ace9ff7b314ab0f7af53ca1e6c

2016-05-04 09:41:58 +00:00

..

android/settings

Merge "Add managed profile setting page" into nyc-dev

2016-05-04 09:41:58 +00:00