Skip to content
Commit 41b01a57 authored by Julius D'souza's avatar Julius D'souza Committed by android-build-merger
Browse files

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

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

Change-Id: I4b5a02f21a394aaa5ec73c88070fdb853b49d68c
parents 2b7a0bdf 9e3c12e1
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