commit | ef27c66392b40900f18519f4cb5ec9e03e097527 | [log] [tgz] |
---|---|---|
author | TreeHugger Robot <treehugger-gerrit@google.com> | Thu Sep 03 07:21:45 2020 +0000 |
committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Thu Sep 03 07:21:45 2020 +0000 |
tree | 3a87da8c1b0e6643b38554e2577301a6b992995b | |
parent | 7053288de1e692aa98511ad2b90086e4e91e35b1 [diff] | |
parent | c612d8a43cff2adb8d7029cc46c76c399ae22ce9 [diff] |
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into stage-aosp-master am: b14bdbdd74 -s ours am: 0d0dc9fa8b -s ours am: 6e43f9a50c -s ours am: c612d8a43c -s ours am skip reason: subject contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12517473 Change-Id: Id49688d3164a3a0d4fabf56b3ac76180ad2c39d5