Skip to content
Commit c5b142de 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 am: 43346642" into oc-dev-plus-aosp
am: 837dd545

Change-Id: I2ee01c0f3094f1aa97c91a8b2e6ee139a715121d
parents 2ed27dc7 837dd545
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