commit | c3cc9152fc92e2c98d54365012e2b0877692c94a | [log] [tgz] |
---|---|---|
author | Treehugger Robot <treehugger-gerrit@google.com> | Sun Sep 06 07:26:35 2020 +0000 |
committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Sun Sep 06 07:26:35 2020 +0000 |
tree | d5d8afda55ebbeb886aebc62d0e0bbc6706fac79 | |
parent | 56274ef49cc583c12a82d7a88133d415e1f159ac [diff] | |
parent | a7ce7c2beafcc3f0efbeac251895669b08bc7704 [diff] |
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" am: 90b0d3f83e -s ours am: 228aa6e038 -s ours am: 267e6ffd2c -s ours am: a7ce7c2bea -s ours am skip reason: subject contains skip directive Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1420004 Change-Id: Id54e76b073b2ffe9fa63da536998679e56f9a279