commit | 96720f6f3f10d7dbe864061a59700100f73ee64c | [log] [tgz] |
---|---|---|
author | Treehugger Robot <treehugger-gerrit@google.com> | Sun Sep 06 03:16:14 2020 +0000 |
committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Sun Sep 06 03:16:14 2020 +0000 |
tree | c9e5cc728e671a5de21b72d7c756453b05db63ef | |
parent | d8bbffa13389982fabeef36b928482b639567150 [diff] | |
parent | fe9f098df47cbd52362d0e455ac8284362caa5af [diff] |
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" am: 8f2203e459 -s ours am: 9681f759e8 -s ours am: fe9f098df4 -s ours am skip reason: subject contains skip directive Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1420492 Change-Id: I04e7716fc6980b7446f933451fc2efa80ed4e731