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