commit | 96d9849a0a6dbd6cd654f342f09bda6396a1ab1e | [log] [tgz] |
---|---|---|
author | Jeff Sharkey <jsharkey@google.com> | Tue Jun 06 15:48:24 2017 +0000 |
committer | android-build-merger <android-build-merger@google.com> | Tue Jun 06 15:48:24 2017 +0000 |
tree | 5e68435d015083c1ed89b3d17127cb7ab37a9dbc | |
parent | 8df1bad5991b9fb95872a840eb58fe517e9ad9f8 [diff] | |
parent | 4786aec7cc5846fd0dfaf1d037269b6dd020433c [diff] |
Merge "Annotate @SystemApi with required permissions." into oc-dev am: c1406978a4 am: 4786aec7cc Change-Id: Ib629e25dbf047c110feaf03e4ff744b5c6df9aeb