aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorXin Li <delphij@google.com>2019-09-08 14:32:18 -0700
committerandroid-build-merger <android-build-merger@google.com>2019-09-08 14:32:18 -0700
commit67f647ee7a8f0eb0ba1d668cc8287a79af61259b (patch)
treeafae83ccd15be32ce5b978b617b34251fd149fff
parentb82fd0c2efc158dd65228de55e2d7b1e5105dc59 (diff)
parent9e4f79f5ff77be4af507e02443a92597f96284e4 (diff)
downloadlua-67f647ee7a8f0eb0ba1d668cc8287a79af61259b.tar.gz
[automerger skipped] Merge qt-r1-dev-plus-aosp-without-vendor (5817612) into stage-aosp-master
am: 9e4f79f5ff -s ours am skip reason: change_id I0cddc58644ab80a4e10b52d9df8c7ecdecce2519 with SHA1 8338a4e720 is in history Change-Id: I0c7eeef2ca93d9b57b47ac7a06110889bd743a0c
0 files changed, 0 insertions, 0 deletions