| commit | 9e3c12e1739f369dda20319b1174a9e2538f25ea | [log] [tgz] |
|---|---|---|
| author | Android Build Merger (Role) <android-build-merger@google.com> | Wed Apr 26 21:07:59 2017 +0000 |
| committer | Android (Google) Code Review <android-gerrit@google.com> | Wed Apr 26 21:08:11 2017 +0000 |
| tree | f011311cb2483027fd24c5c513517e6e43a519c8 | |
| parent | 776f480c4909d96ea4eef05c15ad1ef2df0aed9e [diff] | |
| parent | 17fe2289a2436518f56eed1655e2830cb89e0af6 [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 -s ours" into oc-dev