tree 9e0cd320bf4f2217bfb9ccef920e844ecb84cab2
parent 7238585e2eea81d416e3e98c283e99c3a9a38a1a
parent 75985bbe2f04519cc663db7ad54e8e69f3eabfc0
author John Spurlock <jspurlock@google.com> 1394814744 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1394814744 +0000

am 75985bbe: am 62826f55: am f6228d95: Merge "Fix doc typos in AppOpsManager.java" into klp-docs

* commit '75985bbe2f04519cc663db7ad54e8e69f3eabfc0':
  Fix doc typos in AppOpsManager.java