commit | bf9c988a604e52054d9e7ab29a03f3862e7f921d | [log] [tgz] |
---|---|---|
author | TreeHugger Robot <treehugger-gerrit@google.com> | Wed Sep 02 18:44:15 2020 +0000 |
committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Wed Sep 02 18:44:15 2020 +0000 |
tree | f2d6c4077bc35ce34b940c85a135bb312bf07d67 | |
parent | e8dfd91dbf8497ae67239141d1bbeaf03d054ebc [diff] | |
parent | 424cf3e399c86c766000f2552ca16c1283d26cec [diff] |
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into stage-aosp-master am: 14a9e208c7 -s ours am: 424cf3e399 -s ours am skip reason: subject contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12509747 Change-Id: Iaa530a831bf12b8a57539e3a5098fd281c196911