commit | 4062a506b7020ace0e687c4e7f03168898a14b94 | [log] [tgz] |
---|---|---|
author | Treehugger Robot <treehugger-gerrit@google.com> | Sun Sep 06 03:26:18 2020 +0000 |
committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Sun Sep 06 03:26:18 2020 +0000 |
tree | d5d8afda55ebbeb886aebc62d0e0bbc6706fac79 | |
parent | b336e80b2c38624c9e80a85a7eea17970bebe583 [diff] | |
parent | ffe7d2fbba55acc1c9e98a8a9f0fd30e5fb56d70 [diff] |
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" am: 70d09036bd -s ours am: 70e59c5f79 -s ours am: bf3a6ed0f8 -s ours am: ffe7d2fbba -s ours am skip reason: subject contains skip directive Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1420508 Change-Id: I236253ec7fcf2e8df435e079fa0580f638c19b29