tree 16868c8a3daeee3e968f56f56d9611bafccc32d2
parent 58005ec545fd011418b6400a3b377fea6928c933
parent c9eff23b443f26fb8c4873a6ecb61eded0564163
author Nick Kralevich <nnk@google.com> 1404578726 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1404578726 +0000

am c9eff23b: Merge "Fix typo in DevicePolicyManager documentation"

* commit 'c9eff23b443f26fb8c4873a6ecb61eded0564163':
  Fix typo in DevicePolicyManager documentation