commit | 25e9210120e4dab120d47104395b638bbb1c68c1 | [log] [tgz] |
---|---|---|
author | Treehugger Robot <treehugger-gerrit@google.com> | Sun Sep 06 07:19:15 2020 +0000 |
committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Sun Sep 06 07:19:15 2020 +0000 |
tree | ce8e2fd13dfec98c22e14f5f2d2d93eaef1a2e6f | |
parent | 28a8a193dbb962262598c7b84e10eb5c073d4e52 [diff] | |
parent | e3aab927b4c8a6924165efbdaa4a939bc9a9a395 [diff] |
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" am: 839c760b81 -s ours am: e3aab927b4 -s ours am skip reason: subject contains skip directive Original change: https://android-review.googlesource.com/c/platform/frameworks/opt/chips/+/1420398 Change-Id: I0dc2bfaa0e7a98dc03068ee6430e4f2a63e3edb4