tree 8b3d36ad7422fafe2fadd544cb8275a75eee71f3
parent d47dc7c3bd1cf9fbc549141512bc75c43454ef7c
parent 399cac5b335b7a0a0c0146c6de8b653382caae6a
author John Spurlock <jspurlock@google.com> 1394814971 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1394814971 +0000

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

* commit '399cac5b335b7a0a0c0146c6de8b653382caae6a':
  Fix doc typos in AppOpsManager.java