| commit | d07851a6aae641cf749a153e7d86b045cc500449 | [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 | 8ce316ca1f71def164fb4086bde3ab903ca98045 [diff] | |
| parent | a35e038274f411d10989910b1eb4001c5a5f7196 [diff] |
Merge "Annotate @SystemApi with required permissions." into oc-dev am: c1406978a4 am: a35e038274 Change-Id: Ib629e25dbf047c110feaf03e4ff744b5c6df9aeb