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