Skip to content
Commit 7ac2d2d3 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 am: 27b18cc6  -s ours" into oc-dev-plus-aosp
am: 2da6587b

Change-Id: I59b86164dea86358fb3344dfa51370353e73b12d
parents 4ff13244 2da6587b
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