| commit | 3285bce8c2f21bd0099b3bbd34d63eca1890500d | [log] [tgz] |
|---|---|---|
| author | TreeHugger Robot <treehugger-gerrit@google.com> | Mon Oct 05 15:22:52 2020 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Mon Oct 05 15:22:52 2020 +0000 |
| tree | aec68baa34917b6025e4d0c825f5ec7b35f5cd7d | |
| parent | a5885916fd8e5b0236aa80d308945cdd1630bb29 [diff] | |
| parent | b5d5d0d99c43e123e496c7546e9566d8e24599a4 [diff] |
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into stage-aosp-master am: ea299cb860 -s ours am: 126049588f -s ours am: b5d5d0d99c -s ours am skip reason: subject contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12762766 Change-Id: I3ebd4ed5d03d1e47efca42b042a79a0e9614e588