commit | bfa1e1fd1f07a6db5f0e1638b936cba032cab1a7 | [log] [tgz] |
---|---|---|
author | TreeHugger Robot <treehugger-gerrit@google.com> | Fri Oct 09 13:57:38 2020 +0000 |
committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Fri Oct 09 13:57:38 2020 +0000 |
tree | 8bdaa93b542adac870a296da723505c104d73db3 | |
parent | a849f3414dc269b0a81f7c6e184bd9d0495b6f82 [diff] | |
parent | eb416f0256676df6502dba06b2ccf1b9579d17fc [diff] |
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into stage-aosp-master am: dae77669aa -s ours am: 858fe168ed -s ours am: eb416f0256 -s ours am skip reason: subject contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12801147 Change-Id: I104c515a18e7dd9902782dfb8b7a9f5f429b77bc