Commit 0744ba8e 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

Change-Id: I6ea09ba6a83d530d22a8cc0519fd6bdb4a3688d5
parents bb51b1f1 519ee58e
Loading
Loading
Loading
Loading
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please to comment