commit | a35e038274f411d10989910b1eb4001c5a5f7196 | [log] [tgz] |
---|---|---|
author | Jeff Sharkey <jsharkey@google.com> | Mon Jun 05 22:28:21 2017 +0000 |
committer | android-build-merger <android-build-merger@google.com> | Mon Jun 05 22:28:21 2017 +0000 |
tree | 3a11c2fa2bcb7be28da7ec3b7932ba9c8565a50a | |
parent | f3355b6760c51865d9f61d1c232c02369fa64528 [diff] | |
parent | 0a47018b06e0fce8230e47b8d475ef7f7bc7f5e5 [diff] |
Merge "Annotate @SystemApi with required permissions." into oc-dev am: c1406978a4 Change-Id: I305967cad945a807c3f8234efabaad0ef8b591d1