summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorXin Li <delphij@google.com>2019-09-08 14:27:20 -0700
committerandroid-build-merger <android-build-merger@google.com>2019-09-08 14:27:20 -0700
commit635d5f44fd393d976b3ce2f423d8fc75738db2a8 (patch)
tree7d97d74026f809bc4ff31ec35b4450ff35dc27d6
parentd3e20c94c53d6275559ea35d749135a14688f9a4 (diff)
parentcc35cdd3b4d228a5664800cae7f03f993f8a98ba (diff)
downloaddoclava-635d5f44fd393d976b3ce2f423d8fc75738db2a8.tar.gz
[automerger skipped] Merge qt-r1-dev-plus-aosp-without-vendor (5817612) into stage-aosp-master
am: cc35cdd3b4 -s ours am skip reason: change_id Ide45d9cbe2c437c140f6a756c8b9b04f13ec7a07 with SHA1 3b87006375 is in history Change-Id: I030ff6635b836790ee7772f015da734d8f70f479
0 files changed, 0 insertions, 0 deletions