Skip to content
Commit 5567fc42 authored by Colin Cross's avatar Colin Cross Committed by android-build-merger
Browse files

[automerger skipped] Merge "Convert more of frameworks/base/packages to... 

[automerger skipped] Merge "Convert more of frameworks/base/packages to Android.bp" am: 25fff482 -s ours am: 122f77db -s ours am: 649965cd -s ours
am: 66d11c2a -s ours
am skip reason: change_id I851b819030a1da6091f5d6125a228bb01a99011b with SHA1 20bc2bf3 is in history

Change-Id: Ia2032d4f125fb0ce6bbe0e6c74079e27a9447bd3
parents 6d90dccc 66d11c2a
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