commit | 9331d35e52edb766604bbf6883ac1c4bdd6bf646 | [log] [tgz] |
---|---|---|
author | Treehugger Robot <treehugger-gerrit@google.com> | Sat Sep 05 15:22:26 2020 +0000 |
committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Sat Sep 05 15:22:26 2020 +0000 |
tree | 4ff56bde1d82e854b68b88e14125510cd2de0608 | |
parent | 5712c54098ed1b9f4cc42ce0a2742ef7f454d805 [diff] | |
parent | 677e33de59ad3f0f8ea5cf50417fab992ee50e93 [diff] |
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" am: 72ad337352 -s ours am: 9e1e819f81 -s ours am: 2beaafda59 -s ours am: e34ba8cb4e -s ours am: 677e33de59 -s ours am skip reason: subject contains skip directive Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1420420 Change-Id: Icc88093d2dabe650d3db013b2616d55181abb9d6