commit | 4ab63eaf773d326f342457925ac14949dd23e654 | [log] [tgz] |
---|---|---|
author | Treehugger Robot <treehugger-gerrit@google.com> | Fri Sep 04 14:03:24 2020 +0000 |
committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Fri Sep 04 14:03:24 2020 +0000 |
tree | 8319687fc73911705cea79427cc774ec5d2677cc | |
parent | 4ba8aa407fac9a749bcfe56ceb7b009fdf49d371 [diff] | |
parent | ad1a9ef540af00dd024d10605b07993f7ebf10c0 [diff] |
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" am: a6dc548d57 -s ours am: c17566dbd3 -s ours am: b8d140375c -s ours am: b7287f8ded -s ours am: ad1a9ef540 -s ours am skip reason: subject contains skip directive Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1419721 Change-Id: I4e50da980c6ba8b566b9626a5e88557eaf2412c9