aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorXin Li <delphij@google.com>2019-09-08 15:07:36 -0700
committerandroid-build-merger <android-build-merger@google.com>2019-09-08 15:07:36 -0700
commite5c19ce0d518667098a052507580fe42536f6f31 (patch)
tree28ce16b16a7e52db33e3f6e094e396893e0d2001
parent591d4bcd79740ee1b9ffce64e9dde8cf31f34f41 (diff)
parent0f24028d6635f299d97bc6f08776ff74b06c7503 (diff)
downloadblktrace-e5c19ce0d518667098a052507580fe42536f6f31.tar.gz
[automerger skipped] Merge qt-r1-dev-plus-aosp-without-vendor (5817612) into stage-aosp-master
am: 0f24028d66 -s ours am skip reason: change_id Icca1852f77cb4cc70efa1f6ec95acfe013f8aac3 with SHA1 06df218bfc is in history Change-Id: Id1ebfd80f63917690857a1ff935ac12c22884bbe
0 files changed, 0 insertions, 0 deletions