Skip to content
Commit 0bdd1a2b authored by Julius D'souza's avatar Julius D'souza Committed by android-build-merger
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
am: df97663d

Change-Id: I02710c6d2fb17e670064fd7ec3d8a87c77b02bf2
parents 3878e9b9 df97663d
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