tree ca0945d6e770171a2988095df6619935bf16debd
parent 6a54f120cedac6484c8633e3994da650e7c8c1b6
parent 6b5414ac26f4e25473a33642eb5780b4e37608f1
author Andrew Solovay <asolovay@google.com> 1439694188 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1439694188 +0000

am 6b5414ac: am 835032bb: am 24e05601: am 186c4c2f: am 886e382d: Merge "docs: Added Javadoc links for new M Preview permissions methods" into mnc-dev

* commit '6b5414ac26f4e25473a33642eb5780b4e37608f1':
  docs: Added Javadoc links for new M Preview permissions methods