tree e9502733dcf804c10a94d27b4e707f949792eed8
parent 519ee58ec37507ace304c78629d16733e6f8a9ac
parent aa1078912ff6ef28a1e83247b61d7b7b180f829e
author Anton Hansson <hansson@google.com> 1529412512 -0700
committer android-build-merger <android-build-merger@google.com> 1529412512 -0700

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

Change-Id: Ida599c569b7e88f50af6ffd267e4a67275e654fc