summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorXin Li <delphij@google.com>2020-09-11 03:33:54 +0000
committerAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>2020-09-11 03:33:54 +0000
commitb0c77871b0770d9203f7548255dc1c13c0366e7e (patch)
tree66441081fb1531925f3cb38745a0f2ae7ca9ad04
parentcad904726d98cdc4df3df6af004eb47c95de9d75 (diff)
parentf31d1ca5a0551b2ee044a0f5e4cc82ccefd5f307 (diff)
downloaduml-b0c77871b0770d9203f7548255dc1c13c0366e7e.tar.gz
[automerger skipped] Merge Android R am: 785c2bcbe6 -s ours am: eb3ab2267e -s ours am: f31d1ca5a0 -s ours
am skip reason: Change-Id Ia8ae3d390e8ce65cc391f18eb2faba68701d32d4 with SHA-1 a7aaaa718a is in history Original change: https://android-review.googlesource.com/c/device/generic/uml/+/1422308 Change-Id: I2b455ac40d5cbaa52b3c3ded8765d660c31ce154
0 files changed, 0 insertions, 0 deletions