| commit | 0bdd1a2bb474e02e1a7478938cd92454bb0ce4fc | [log] [tgz] |
|---|---|---|
| author | Julius D'souza <jdsouza@google.com> | Wed Apr 26 21:32:10 2017 +0000 |
| committer | android-build-merger <android-build-merger@google.com> | Wed Apr 26 21:32:10 2017 +0000 |
| tree | 34115d116a39a073dd891938f9d6f740d192f20a | |
| parent | 3878e9b99c863b3a9546a8fad78f3b2d631e535b [diff] | |
| parent | df97663d236a892ecf473e76fb449ae8c221109b [diff] |
Merge "Merge "DO NOT MERGE: change SET_DISPLAY_OFFSET namespace to com.android.permission.* This is to avoid API Level 25 CTS issues. am: 31add96517 am: a701205315 -s ours" into oc-dev am: 9e3c12e173" into oc-dev-plus-aosp am: df97663d23 Change-Id: I02710c6d2fb17e670064fd7ec3d8a87c77b02bf2