summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorXin Li <delphij@google.com>2019-09-08 17:34:53 -0700
committerandroid-build-merger <android-build-merger@google.com>2019-09-08 17:34:53 -0700
commitd1ad267eb863829c54809c66077400b5e48a1a47 (patch)
tree0e3600a80cd4c3877072c5175132c350fddd287a
parent4bd0674b45135e58210ea3399423de248ec120bb (diff)
parentc0378db17a7e5b85cb006074a65949f232dd8b2a (diff)
downloadmedia-d1ad267eb863829c54809c66077400b5e48a1a47.tar.gz
[automerger skipped] Merge qt-r1-dev-plus-aosp-without-vendor (5817612) into stage-aosp-master am: 82e4d0f00d -s ours am: 9af2f3bf69 -s ours
am: c0378db17a -s ours am skip reason: change_id Id34b9a5175c55e22b1c2f2d1b3fb62a7e5f497d6 with SHA1 6e57c01c49 is in history Change-Id: Ie08fffb7cabd850dcf027e1cd2ff5629b8f7dcc4
0 files changed, 0 insertions, 0 deletions