| commit | e89550222387ce083863b89886bc43af2da61fbc | [log] [tgz] |
|---|---|---|
| author | TreeHugger Robot <treehugger-gerrit@google.com> | Thu Sep 03 15:27:07 2020 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Thu Sep 03 15:27:07 2020 +0000 |
| tree | 90d8061def99099e464e6d125efd08f3bc13f246 | |
| parent | 0cfc7f9932fd49bb8f2a4aaa98ccbf1bd103837b [diff] | |
| parent | 14d438a337296b965f9510f7eb820d8b04fcec48 [diff] |
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into stage-aosp-master am: 14d438a337 -s ours am skip reason: subject contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12515250 Change-Id: I2afceeedf1a90fc10c981a4d139004ce5f237030