summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBill Yi <byi@google.com>2019-06-18 15:58:10 -0700
committerandroid-build-merger <android-build-merger@google.com>2019-06-18 15:58:10 -0700
commit1a7b83955fd0410b61e74f1ccacf64ac221b37fc (patch)
treefb694b5fe996c26fa7a53f6ffa440346adfc7661
parentcd18be2123718ce1e8a10b5ec12f20f84f4afd2d (diff)
parent9ea1842c38271e4c1672da709aa4b2dc1094e8d3 (diff)
[automerger skipped] Merge "Import translations. DO NOT MERGE" into qt-dev
am: 9ea1842c38 -s ours am skip reason: subject contains skip directive Change-Id: I99cd5beff45284f520dbf22c212d999db9eeb377
0 files changed, 0 insertions, 0 deletions