commit | 8caaa711c6399e97b7fde0407a546fd46c536dc8 | [log] [tgz] |
---|---|---|
author | TreeHugger Robot <treehugger-gerrit@google.com> | Sun Dec 06 16:15:47 2020 +0000 |
committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Sun Dec 06 16:15:47 2020 +0000 |
tree | 7652ac3d66acf9b55fe6815121dd2219e2c8716a | |
parent | c0ab918d545f0da7394d7c83bd34c89f8b462ae9 [diff] | |
parent | c110ac2338dd4ea61747f311a3c88cbcb2acb6d3 [diff] |
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into stage-aosp-master am: c110ac2338 -s ours am skip reason: subject contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/13175748 Change-Id: I1f8d60bdc2eac29accbc1e93610a7ebb3c8bb254