tree 99962917a2afd3320cb77a3cdb12d5b96bd4293d
parent c382355cc1ab65017e74d7e0d43efe791ca741cd
parent c1406978a4be2d7462142f6c3b3fcdfaca50ec67
author Jeff Sharkey <jsharkey@google.com> 1496701701 +0000
committer android-build-merger <android-build-merger@google.com> 1496701701 +0000

Merge "Annotate @SystemApi with required permissions." into oc-dev
am: c1406978a4

Change-Id: I305967cad945a807c3f8234efabaad0ef8b591d1