summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorXin Li <delphij@google.com>2019-09-08 15:04:18 -0700
committerandroid-build-merger <android-build-merger@google.com>2019-09-08 15:04:18 -0700
commit95c3139bbee718a3980feb685ade28affe92ef86 (patch)
tree994917bfe4c52a7ef203b8e4269402670aeef5fc
parent654ec85e9f943a35b1b77a515594c5203f4f2006 (diff)
parent3ee74659ab2b838fd439fb47d7798b4a30503c9e (diff)
downloadopengl-transport-95c3139bbee718a3980feb685ade28affe92ef86.tar.gz
[automerger skipped] Merge qt-r1-dev-plus-aosp-without-vendor (5817612) into stage-aosp-master
am: 3ee74659ab -s ours am skip reason: change_id I9c84a0c1f8be7e5e24702cfafb773b3bbf97ceb3 with SHA1 607711c60d is in history Change-Id: Ib0b25b156528af6345b929d6a77d96733f0c27fd
0 files changed, 0 insertions, 0 deletions