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