Commit 76dd93f2 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 ... 

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

Change-Id: If701fe13eff49f0e8d729ceab155d95ef3e4eec8
parents 34e5d928 b84800c3
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