| commit | 4786aec7cc5846fd0dfaf1d037269b6dd020433c | [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 | 834637a82411a2e097a691061e432572bbb5f1a2 [diff] | |
| parent | ad1cebe58e5c3449c16ebd5659efa2b88c22e2ab [diff] |
Merge "Annotate @SystemApi with required permissions." into oc-dev am: c1406978a4 Change-Id: I305967cad945a807c3f8234efabaad0ef8b591d1