Commit 34e5d928 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: 519ee58e -s ours 

am: 0744ba8e  -s ours

Change-Id: Id6d7e754ec38cfcdc3d58c3a7776e75a3133444a
parents 438decf3 0744ba8e
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