| commit | cbc7b55c3d3e11f42f778b129b30a3ca308c5284 | [log] [tgz] |
|---|---|---|
| author | Treehugger Robot <treehugger-gerrit@google.com> | Fri Sep 04 08:21:15 2020 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Fri Sep 04 08:21:15 2020 +0000 |
| tree | faa2874e67fc4d971e2d00a7a5515aa1f0596076 | |
| parent | 8dd48c609a54af4cc45b3b4af825f998667f5594 [diff] | |
| parent | c52327b7149b047deb018ac1a2fae1851051d656 [diff] |
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" am: a37e4c6327 -s ours am: e2f78c8a82 -s ours am: c52327b714 -s ours am skip reason: subject contains skip directive Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1419991 Change-Id: Ic3c99636eea6ffad3e8a9b54b31c48b043fc8f40