Sudheer Shanka 7469d799a8 Merge "Avoid triggering device admin settings in non-current user." into nyc-dev ...

am: a433fd2429

* commit 'a433fd2429dfc37ab60b4dc7a17cb2e714ef6fbd':
  Avoid triggering device admin settings in non-current user.

Change-Id: Ica84a34db826fa02130aa85efff40544b246c3ef

2016-06-03 17:13:09 +00:00

..

android/settings

Merge "Avoid triggering device admin settings in non-current user." into nyc-dev

2016-06-03 17:13:09 +00:00