| commit | 02204628e5520e731552858ad6499eab7c3f0f84 | [log] [tgz] |
|---|---|---|
| author | TreeHugger Robot <treehugger-gerrit@google.com> | Thu Sep 03 06:44:36 2020 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Thu Sep 03 06:44:36 2020 +0000 |
| tree | c0b93d439cb39b9eb973b3144b23658ed8f96137 | |
| parent | 25e69b7fdd85e85c529eeaa034a2d526699f53b3 [diff] | |
| parent | cd4a8cbf2e60cf3aee2ea934d41d54b253cbbac5 [diff] |
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into stage-aosp-master am: cc822e170a -s ours am: cd4a8cbf2e -s ours am skip reason: subject contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12513073 Change-Id: Ie521947f8da83280340c6b7e6765a506a1847d4c