summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBill Yi <byi@google.com>2019-11-09 15:59:33 -0800
committerandroid-build-merger <android-build-merger@google.com>2019-11-09 15:59:33 -0800
commit665890298406c994fb95657220fbefcd138c9236 (patch)
tree5034a5921cfa33b9312722e06eae302e21d0cf8f
parentc0516df314923a404dd71b873ad9d6b2421ee1db (diff)
parent4ab9f8859832b67531d835f1de53a900c250a9ec (diff)
downloadbase-665890298406c994fb95657220fbefcd138c9236.tar.gz
[automerger skipped] Merge "Import translations. DO NOT MERGE" into qt-qpr1-dev
am: 4ab9f88598 -s ours am skip reason: subject contains skip directive Change-Id: Ia2599d4a14af6a8c6d5b75f0afcdf00038a082f6
0 files changed, 0 insertions, 0 deletions