| commit | 69fefeff6402921f7f95bb450e63a6867d10a092 | [log] [tgz] |
|---|---|---|
| author | Treehugger Robot <treehugger-gerrit@google.com> | Fri Oct 23 21:17:59 2020 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Fri Oct 23 21:17:59 2020 +0000 |
| tree | 34c47b98a761782cfb19938120cb45b3b95ddb8c | |
| parent | 0c4f8f2f9d6995f8147aa81f4c0d358d127005c9 [diff] | |
| parent | 8500c90d5c2223b914f4f49fea63939878ba54ee [diff] |
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" am: b7dc979577 -s ours am: fba69cad44 -s ours am: e8b43ffeed -s ours am: 8500c90d5c -s ours am skip reason: subject contains skip directive Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1470260 Change-Id: I3f77259fb8f6b746e06441c9ddd075a3f8b745fc