tree 08876a33c3589816e0757f9fbafc8cc11b0d8cd8
parent 459a55975ebb70fff6618b8b3c456140121ffd74
parent d9cb5a7344c1a04a52445a410a875b79d4c38a62
author Amith Yamasani <yamasani@google.com> 1411594484 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1411594484 +0000

am eb5fb023: Merge "Return masked location mode for managed profiles" into lmp-dev

* commit 'eb5fb0236f3ed0c8068d5e65f2396047ae69f78b':
  Return masked location mode for managed profiles