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

Change-Id: Ibb9f276b988d3a412e9f323e0cfa5c8df55b91a0
parents 6f09b69e 80953c55
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