summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTreehugger Robot <treehugger-gerrit@google.com>2020-09-05 13:57:54 +0000
committerAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>2020-09-05 13:57:54 +0000
commit40c724bf29553d8f5b5bbb2deec0ba2123bb4d98 (patch)
treec43b959ebcbe451da1190f98d4d90e0d35e58932
parenta3d3942140d28ce9a0875d17b4ff7a55bcac2c54 (diff)
parentbe1f367ae1a3b7cf3619faf693746489590770cc (diff)
downloadbase-40c724bf29553d8f5b5bbb2deec0ba2123bb4d98.tar.gz
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" am: be1f367ae1 -s ours
am skip reason: subject contains skip directive Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1420417 Change-Id: I6c8bf9da033424228df119bfc95f22a738c96a38
0 files changed, 0 insertions, 0 deletions