| commit | 2da6587b9183ebbc45a5a6caa87a2cb41d9f24c3 | [log] [tgz] |
|---|---|---|
| author | Android Build Merger (Role) <android-build-merger@google.com> | Wed Apr 26 21:00:51 2017 +0000 |
| committer | Android (Google) Code Review <android-gerrit@google.com> | Wed Apr 26 21:00:56 2017 +0000 |
| tree | 1f59daefa707492af1ea2bebdcadd2b6c62fcdd8 | |
| parent | 1534d44e3f228dbf234f4bc4d77baf9348c0d0fe [diff] | |
| parent | 1a24127d066723ab30aa751912f78b915e8ec1e0 [diff] |
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 am: 27b18cc632 -s ours" into oc-dev-plus-aosp