| commit | ec68b46bc85b2317053da7e2933876fc6e51ac2f | [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 | 2255e80e732a2b4ea68c50685d1dfc8a3956509f | |
| parent | 811e9d6ee820b84922ff6a9794a91c1ebfa958f2 [diff] | |
| parent | 7a2e4a848602ddb861f9f35cb93edbdca32a7db1 [diff] |
Merge "Annotate @SystemApi with required permissions." into oc-dev am: c1406978a4 am: 7a2e4a8486 Change-Id: Ib629e25dbf047c110feaf03e4ff744b5c6df9aeb