commit | 8500c90d5c2223b914f4f49fea63939878ba54ee | [log] [tgz] |
---|---|---|
author | Treehugger Robot <treehugger-gerrit@google.com> | Fri Oct 23 21:02:47 2020 +0000 |
committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Fri Oct 23 21:02:47 2020 +0000 |
tree | 3fecc582545dec88a31a7d53846c341463cf7578 | |
parent | 48225d085194f97de4467d4ff31829dab0d56d41 [diff] | |
parent | e8b43ffeed7ac7a360330eeb513377f23ee5b58c [diff] |
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" am: b7dc979577 -s ours am: fba69cad44 -s ours am: e8b43ffeed -s ours am skip reason: subject contains skip directive Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1470260 Change-Id: I79e5efb3a72153fdf1cf7ae5e6ab84e3e10bec3f