commit | f689459e4e20335898d83be3b25e0273797a697c | [log] [tgz] |
---|---|---|
author | TreeHugger Robot <treehugger-gerrit@google.com> | Thu Sep 03 16:40:26 2020 +0000 |
committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Thu Sep 03 16:40:26 2020 +0000 |
tree | c9ef8d72b4bea2b6a1d79039191ec204e063f61c | |
parent | 9dff9d114b8d5ecd15c3b73c3736040ab6176bdb [diff] | |
parent | c418cfe3955f2f7512f302137e6ddb1e7203580b [diff] |
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into stage-aosp-master am: 94fbf790d7 -s ours am: e177a3da93 -s ours am: 001d184b53 -s ours am: c418cfe395 -s ours am skip reason: subject contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12515250 Change-Id: I1a9fe4f839f9e49b613ab3f4814620793d0db5d9