Skip to content
Commit df97663d authored by Android Build Merger (Role)'s avatar Android Build Merger (Role) Committed by Android (Google) Code Review
Browse files

Merge "Merge "DO NOT MERGE: change SET_DISPLAY_OFFSET namespace to... 

Merge "Merge "DO NOT MERGE: change SET_DISPLAY_OFFSET namespace to com.android.permission.* This is to avoid API Level 25 CTS issues. am: 31add965 am: a7012053  -s ours" into oc-dev am: 9e3c12e1" into oc-dev-plus-aosp
parents 36e4de57 41b01a57
Hide whitespace changes
Inline Side-by-side
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment