commit | e30890a402e963de7b7fd380e8d8536efbeb4ee8 | [log] [tgz] |
---|---|---|
author | Treehugger Robot <treehugger-gerrit@google.com> | Sat Sep 05 05:49:20 2020 +0000 |
committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Sat Sep 05 05:49:20 2020 +0000 |
tree | d5d8afda55ebbeb886aebc62d0e0bbc6706fac79 | |
parent | 7dda65827646c307824e51fd08bbd870b09a107d [diff] | |
parent | 7be4ab0f9d641fb3caa32b9f4506ab0d46fd4f7c [diff] |
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" am: 5e2016da9a -s ours am: 66a625cfcf -s ours am: a94d9958db -s ours am: 7be4ab0f9d -s ours am skip reason: subject contains skip directive Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1420263 Change-Id: Iad566310602f142a484e2cf747baf0dc046bc4f5