commit | 222ea67d6b0577439785b8a99752cf389d95efad | [log] [tgz] |
---|---|---|
author | TreeHugger Robot <treehugger-gerrit@google.com> | Thu Sep 03 08:55:19 2020 +0000 |
committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Thu Sep 03 08:55:19 2020 +0000 |
tree | 663453f92f06729f2f865238660bd9f7368dd159 | |
parent | 252c0e747325fbd2845d05cd18897f99c972791e [diff] | |
parent | 6ffba8f337e0f020751e26464f011b2c2ceb8bb8 [diff] |
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into stage-aosp-master am: 6ffba8f337 -s ours am skip reason: subject contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12515760 Change-Id: I2c3c7600a6b5a4344adeb02d63af2473eed8c866