tree fc7a5ca357e178a646a5ed697aa99c83bf61b07b
parent 102b9e596820c1c2b7d43b48fe4e10412e960ae5
parent d86b8fea43ebb6e5c31691b44d8ceb0d8d3c9072
author Jeff Sharkey <jsharkey@google.com> 1496701181 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 1496701189 +0000

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