Commit b84800c3 authored by Anton Hansson's avatar Anton Hansson Committed by android-build-merger
Browse files

[automerger skipped] Inline contents from embedded.mk in uml. am: aa107891 -s ours 

am: fa1935df  -s ours

Change-Id: I56df678b468ccd040ecc075b420d9099e86e9eaa
parents 0744ba8e fa1935df
Show whitespace changes
Inline Side-by-side
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Please to comment