commit | b8d140375c068ed3010e1abc9e607bccd15efbc3 | [log] [tgz] |
---|---|---|
author | Treehugger Robot <treehugger-gerrit@google.com> | Fri Sep 04 13:08:54 2020 +0000 |
committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Fri Sep 04 13:08:54 2020 +0000 |
tree | bee7682b401932290b0a8affa3cc0dc1a12c099b | |
parent | c0f911ce35b6ca91e4073855b4944f904ba5559f [diff] | |
parent | c17566dbd30fb854e7bcccc0f01821b040f88852 [diff] |
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" am: a6dc548d57 -s ours am: c17566dbd3 -s ours am skip reason: subject contains skip directive Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1419721 Change-Id: I932e1f79010f28ff15ebedebe6e6f7bd10f24b9b