| commit | d038ee8e1e901fe76f6c4bbfc6eb8374f90f2b5e | [log] [tgz] |
|---|---|---|
| author | TreeHugger Robot <treehugger-gerrit@google.com> | Tue Oct 06 06:34:09 2020 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Tue Oct 06 06:34:09 2020 +0000 |
| tree | 6d9372f9fc2db010c16c709f3f8467f7bfa23c11 | |
| parent | 970bd09428d92e18dfd36a9c55b97eb23eb70fd6 [diff] | |
| parent | c65ae4deef7e81b59fda067cc66e27f664758724 [diff] |
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into stage-aosp-master am: 16381c8fd5 -s ours am: c65ae4deef -s ours am skip reason: subject contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12769370 Change-Id: I57482f6dca00253e33d7caf75fe2969a22981fba