| commit | f5d7230dcafeb360e24eaddb07881b18538f1fcb | [log] [tgz] |
|---|---|---|
| author | TreeHugger Robot <treehugger-gerrit@google.com> | Mon Oct 05 16:37:43 2020 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Mon Oct 05 16:37:43 2020 +0000 |
| tree | aec68baa34917b6025e4d0c825f5ec7b35f5cd7d | |
| parent | fd9c90f4dcdcf6bdf1119825ced6de0ee5e463d4 [diff] | |
| parent | 589cfeef0d179093ac7cd18e0d89cb5029ec38f1 [diff] |
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into stage-aosp-master am: a73565777d -s ours am: 30a3c80b8a -s ours am: 589cfeef0d -s ours am skip reason: subject contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12759560 Change-Id: I78055b1c51053c444d1b1b90cee266c69c68ff41