summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAnton Hansson <hansson@google.com>2018-06-19 03:46:02 -0700
committerandroid-build-merger <android-build-merger@google.com>2018-06-19 03:46:02 -0700
commit34e5d92885d47028aa5c57fbafa0193a7bc0ecaf (patch)
treee9502733dcf804c10a94d27b4e707f949792eed8
parent438decf30bae50551a00ae08f3cf0493a00fc2d9 (diff)
parent0744ba8e0a3f6460b4aa29f2c7b4eff123bfb577 (diff)
downloaduml-34e5d92885d47028aa5c57fbafa0193a7bc0ecaf.tar.gz
[automerger skipped] Inline contents from embedded.mk in uml. am: 519ee58ec3 -s ours
am: 0744ba8e0a -s ours Change-Id: Id6d7e754ec38cfcdc3d58c3a7776e75a3133444a
0 files changed, 0 insertions, 0 deletions