summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorXin Li <delphij@google.com>2019-09-08 14:51:01 -0700
committerandroid-build-merger <android-build-merger@google.com>2019-09-08 14:51:01 -0700
commit585e10f352fe726ecdc6c131dcbf0ca2c5753bfe (patch)
treef5d1e4306b4a9dc95ee1a3d2f16d001888fda27a
parentb42f3ebc3601771e37447446ee9a44e2ca9ee800 (diff)
parentc54d6f0a6fa3d7086f4287d52e4a1956b27bac07 (diff)
downloadkotlinc-585e10f352fe726ecdc6c131dcbf0ca2c5753bfe.tar.gz
[automerger skipped] Merge qt-r1-dev-plus-aosp-without-vendor (5817612) into stage-aosp-master am: b80632f517 -s ours
am: c54d6f0a6f -s ours am skip reason: change_id Ia37a39990f81e2b8965952c98a2538a3ac377259 with SHA1 f2b45790fe is in history Change-Id: If1ce2b229a149da10d4073a3c53a27ff4cbd5ff8
0 files changed, 0 insertions, 0 deletions