commit | 0d16ad739c306d75fb5cac9636062a2a97f3ae47 | [log] [tgz] |
---|---|---|
author | TreeHugger Robot <treehugger-gerrit@google.com> | Wed Oct 07 15:39:30 2020 +0000 |
committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Wed Oct 07 15:39:30 2020 +0000 |
tree | ee94849c5e7d84619c3ee2b84c091cc3dc0302be | |
parent | 37280d5876712c9d3c8fd0a8bb3271e1d86d4a37 [diff] | |
parent | 836eee53ef1903e59543226175c5b823018ac1f6 [diff] |
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into stage-aosp-master am: aabad94a4d -s ours am: 5d29c1510b -s ours am: 836eee53ef -s ours am skip reason: subject contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12779439 Change-Id: I40df8119ef463957bdd2086573c41d448e2f07e3