commit | 97b00aac148d255cf63b1ed943cd3f781148ea28 | [log] [tgz] |
---|---|---|
author | Treehugger Robot <treehugger-gerrit@google.com> | Fri Sep 04 19:29:18 2020 +0000 |
committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Fri Sep 04 19:29:18 2020 +0000 |
tree | bee7682b401932290b0a8affa3cc0dc1a12c099b | |
parent | 0ec2984c87ed31547ee2946b1520f3536c0c453d [diff] | |
parent | 6480a4098ebcf938af0842a7a2a0cba377353b95 [diff] |
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" am: 0d361b8f53 -s ours am: 6480a4098e -s ours am skip reason: subject contains skip directive Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1419943 Change-Id: I03163f20838f2515a25a00b8fab9c2fc2185a241