| commit | 4354e0b08a5b7aad6d854913fc5a2ba5a37652eb | [log] [tgz] |
|---|---|---|
| author | TreeHugger Robot <treehugger-gerrit@google.com> | Thu Sep 03 09:14:32 2020 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Thu Sep 03 09:14:32 2020 +0000 |
| tree | 6bc1d197a89b4fc8733f35a0d78a7dde37e37be7 | |
| parent | fb2791644854ec3952c4177154469443ec9b7c29 [diff] | |
| parent | 7a8f5068150528655bd0c9f3fbba344bf57a864d [diff] |
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into stage-aosp-master am: 1051ed16e7 -s ours am: 252c0e7473 -s ours am: 9ba16c4807 -s ours am: 7a8f506815 -s ours am skip reason: subject contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12516627 Change-Id: I51192a3c0c4291d3c6ca6e6ab249fb1b9e0b8228