Merge "Avoid triggering device admin settings in non-current user." into nyc-dev am: a433fd2429 am: 377623b6ee

am: c3201f73ef

* commit 'c3201f73ef7490a7446e54217d4923b6e5cf4f63':

Change-Id: I3a80cb049f704c9b28dfd0de3843971039eb25b5
This commit is contained in:
Sudheer Shanka
2016-06-03 17:53:52 +00:00
committed by android-build-merger

Diff Content Not Available