Skip to content
Commit 48503846 authored by Anna Trostanetski's avatar Anna Trostanetski Committed by android-build-merger
Browse files

[automerger skipped] Merge "Move IPlatformCompat.aidl definition to... 

[automerger skipped] Merge "Move IPlatformCompat.aidl definition to framework.jar" am: 1261967c -s ours am: 1d57038e -s ours
am: 59e7925c -s ours
am skip reason: change_id Ifc1b97ad40c2baf65a86169e101acfa72e3aae5f with SHA1 fee45aa4 is in history

Change-Id: Iccdb93af0b1ec642231abc6c18d0fed5018e80f8
parents 9a5fea62 59e7925c
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