summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBill Yi <byi@google.com>2019-06-25 17:45:49 -0700
committerandroid-build-merger <android-build-merger@google.com>2019-06-25 17:45:49 -0700
commitfe3a203d8a405878026a848a59d9b3e645974923 (patch)
tree73fa174a3b9faca523ac8e5b5dd75ec9972e126a
parent0f027276fba8f8f7ac85ce248cd9ba5133ae3478 (diff)
parentd077a0bb431491b385f50930eb173371bd078ddd (diff)
downloadMedia-fe3a203d8a405878026a848a59d9b3e645974923.tar.gz
[automerger skipped] Merge "Import translations. DO NOT MERGE" into qt-dev
am: d077a0bb43 -s ours am skip reason: subject contains skip directive Change-Id: Ic6ee68811d5b1c3218145d45415c2ffd19375f4c
0 files changed, 0 insertions, 0 deletions