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

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

Change-Id: I6ea09ba6a83d530d22a8cc0519fd6bdb4a3688d5