| commit | bd264263309e98551103b1a9f989d9aaa8c0c41a | [log] [tgz] |
|---|---|---|
| author | Treehugger Robot <treehugger-gerrit@google.com> | Fri Sep 04 13:54:32 2020 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Fri Sep 04 13:54:32 2020 +0000 |
| tree | d5d8afda55ebbeb886aebc62d0e0bbc6706fac79 | |
| parent | ea488b51a1ba9f096e9e9d7412ac08aa704d22b9 [diff] | |
| parent | 936bf3042f193b44024847614eea04f2ab30d5ef [diff] |
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" am: 0496eccd66 -s ours am: 027e5760b4 -s ours am: 6cbb816221 -s ours am: 936bf3042f -s ours am skip reason: subject contains skip directive Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1419720 Change-Id: Icbd3c36d1e39f0f6302182ecc486fcb8c55074a5