summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTreehugger Robot <treehugger-gerrit@google.com>2020-09-05 14:18:57 +0000
committerAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>2020-09-05 14:18:57 +0000
commit47c1d3f7a8dafe650a7385d529b42ad729bbd12b (patch)
treec43b959ebcbe451da1190f98d4d90e0d35e58932
parent9e1e819f81f84adb4ae09c691c01a0e530101f20 (diff)
parent8d9e8ba8224e60ee764a9b6692e348234cf58d0e (diff)
downloadbase-47c1d3f7a8dafe650a7385d529b42ad729bbd12b.tar.gz
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" am: 8d9e8ba822 -s ours
am skip reason: subject contains skip directive Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1420421 Change-Id: I2925d55ed851b91137de7e23ef87cff710083f93
0 files changed, 0 insertions, 0 deletions