Skip to content
Commit 80953c55 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: 48503846 -s ours
am skip reason: change_id Ifc1b97ad40c2baf65a86169e101acfa72e3aae5f with SHA1 fee45aa4 is in history

Change-Id: I560044cccfbe0dfdcffdbfb3d18096d6f2d79ff1
parents ff545cf5 48503846
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