commit | 113ea77b05cf97285ff8276993e6e7a3b06f09d3 | [log] [tgz] |
---|---|---|
author | Treehugger Robot <treehugger-gerrit@google.com> | Sun Sep 06 07:26:08 2020 +0000 |
committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Sun Sep 06 07:26:08 2020 +0000 |
tree | d5d8afda55ebbeb886aebc62d0e0bbc6706fac79 | |
parent | 8feb6c9e2af673bdfe6e9d5b7d58763d950a4679 [diff] | |
parent | 69098857ddecb2638505f8a35eda807198fb080b [diff] |
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" am: e012e327c7 -s ours am: 5530f09269 -s ours am: 75cec2db9e -s ours am: 69098857dd -s ours am skip reason: subject contains skip directive Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1420005 Change-Id: I7cb6f9a6301164d4dce63012d486e2b76467d19d