commit | 2af78f834285397e3a6e560a9dda042aa9204718 | [log] [tgz] |
---|---|---|
author | TreeHugger Robot <treehugger-gerrit@google.com> | Wed Oct 07 15:39:43 2020 +0000 |
committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Wed Oct 07 15:39:43 2020 +0000 |
tree | ee94849c5e7d84619c3ee2b84c091cc3dc0302be | |
parent | 0d16ad739c306d75fb5cac9636062a2a97f3ae47 [diff] | |
parent | 38b00969e879aaef6f0e3511a52b81ce677c76aa [diff] |
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into stage-aosp-master am: cfe0491c27 -s ours am: 70517ab022 -s ours am: 38b00969e8 -s ours am skip reason: subject contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12779776 Change-Id: I672e6ba5efe3405d74f9f18d4c6471823e2d801d