aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorXin Li <delphij@google.com>2019-10-30 14:23:16 -0700
committerandroid-build-merger <android-build-merger@google.com>2019-10-30 14:23:16 -0700
commitfb734ea0e884efca41bedcf04d8d6836dc547872 (patch)
treef79f5aceda736187485f696a95209ad5eb108580
parenta6e64234d41c6b1f2c2ed1a0ec1205b7b2f66025 (diff)
parent50feb72fbdf40e983cc33e325eec7acf7aa72286 (diff)
downloadcpython2-fb734ea0e884efca41bedcf04d8d6836dc547872.tar.gz
[automerger skipped] DO NOT MERGE - qt-qpr1-dev-plus-aosp-without-vendor@5915889 into stage-aosp-master am: 8c8f0bb466
am: 50feb72fbd -s ours am skip reason: subject contains skip directive Change-Id: I56aa0aec08faab903adc1e7fc4267a7ed6be201a
0 files changed, 0 insertions, 0 deletions