commit | c43d935c42a55f7498a89d52a7df8592e7f06477 | [log] [tgz] |
---|---|---|
author | TreeHugger Robot <treehugger-gerrit@google.com> | Sun Dec 06 20:17:06 2020 +0000 |
committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Sun Dec 06 20:17:06 2020 +0000 |
tree | ba6c3bc9147c41b0b3d62f48824d83f5832ad5cc | |
parent | 20575d9e45adc99c40fe55cbf5b23c263e219ed2 [diff] | |
parent | cb702b1f630c36312b4d0f48070bbfbcf35d002e [diff] |
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into stage-aosp-master am: 71550d5204 -s ours am: cb702b1f63 -s ours am skip reason: subject contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/13174757 Change-Id: I8cd5faf0178e903a00a9becf94e6867b2268d75f