tree 52b8a1f15c08ac4e4121ea0dad578b0656d0e9f1
parent 19e83f3983d76b35b5116b2bbd867d3160f7f7b2
parent 2ce2f84999cc3e627d4f6aed316b50ae7179b004
author Amith Yamasani <yamasani@google.com> 1504838351 +0000
committer android-build-merger <android-build-merger@google.com> 1504838351 +0000

Merge "Javadoc update for permission requirements" into oc-mr1-dev
am: 2ce2f84999

Change-Id: I6703ab1128202f5928d574c55d0f4a9129c95b60