commit | 677e33de59ad3f0f8ea5cf50417fab992ee50e93 | [log] [tgz] |
---|---|---|
author | Treehugger Robot <treehugger-gerrit@google.com> | Sat Sep 05 15:11:48 2020 +0000 |
committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Sat Sep 05 15:11:48 2020 +0000 |
tree | d5d8afda55ebbeb886aebc62d0e0bbc6706fac79 | |
parent | ea4001c008a0efb638db43364abe9862e754bf4a [diff] | |
parent | e34ba8cb4ec010a9ec0f91ffd0185b74eb66669a [diff] |
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" am: 72ad337352 -s ours am: 9e1e819f81 -s ours am: 2beaafda59 -s ours am: e34ba8cb4e -s ours am skip reason: subject contains skip directive Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1420420 Change-Id: I2a69cfff09c7c52f0efd620b04a6a89e94982d76