aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorXin Li <delphij@google.com>2019-09-08 15:13:04 -0700
committerandroid-build-merger <android-build-merger@google.com>2019-09-08 15:13:04 -0700
commit8de23a3d1c9530cfd3fd752b27c8f5a7912a796c (patch)
treed63135df0e611e34319dc4f50f04fa715a1a17bf
parent28f6f206e09f2bcc69af15064d45185a685881fd (diff)
parent617eb5bacb920a1fa5ea2aea8cfff07f688d6dcb (diff)
downloadlibopus-8de23a3d1c9530cfd3fd752b27c8f5a7912a796c.tar.gz
[automerger skipped] Merge qt-r1-dev-plus-aosp-without-vendor (5817612) into stage-aosp-master am: 2bfb91e57b -s ours am: 36eb953bf1 -s ours
am: 617eb5bacb -s ours am skip reason: change_id Icd401ad4d25c9a48e3befba9d6aae66cc5f67785 with SHA1 244dc17f49 is in history Change-Id: I3c32cca2a3e0eff9d0e90c4f5cc9ea4847bbfd01
0 files changed, 0 insertions, 0 deletions