| commit | b8a7c3032054c332173406e75518fb214c3044dd | [log] [tgz] |
|---|---|---|
| author | TreeHugger Robot <treehugger-gerrit@google.com> | Tue Oct 06 00:13:35 2020 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Tue Oct 06 00:13:35 2020 +0000 |
| tree | c0649b46ea876aab903e2da8c9d3ece517f4b87f | |
| parent | 03cc54fc3f26ec7845895458fe72e30730edf9fa [diff] | |
| parent | 152b887c739bd2b8da79ca0221ce5ab60d0530f4 [diff] |
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into stage-aosp-master am: d0fc9d92e9 -s ours am: 0544e627bc -s ours am: 152b887c73 -s ours am skip reason: subject contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12764984 Change-Id: Ia65e562c876696f8e47ed078af43125abee9f553