| commit | 24c7da72ea428bfe6e08ec9d4b81b9147b8f8338 | [log] [tgz] |
|---|---|---|
| author | TreeHugger Robot <treehugger-gerrit@google.com> | Wed Sep 02 16:37:36 2020 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Wed Sep 02 16:37:36 2020 +0000 |
| tree | f2d6c4077bc35ce34b940c85a135bb312bf07d67 | |
| parent | 81c0905c57969d201222d1e2c792b95cfb7ceedb [diff] | |
| parent | 398c2db050563f88048347011998e2dd406d55b3 [diff] |
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into stage-aosp-master am: dd326a21d4 -s ours am: 398c2db050 -s ours am skip reason: subject contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12508892 Change-Id: Iaf76a8cdeffb7f5702d58358c0333d261357edd7