commit | 18ec4996af964a73ab0365550a1107e852938800 | [log] [tgz] |
---|---|---|
author | TreeHugger Robot <treehugger-gerrit@google.com> | Fri Oct 09 18:08:13 2020 +0000 |
committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Fri Oct 09 18:08:13 2020 +0000 |
tree | 3d06132f296a04a2d4a14008f017696fe57cc0c6 | |
parent | 0b22366dc729a5751881eaf66f6e5936b8e19fd8 [diff] | |
parent | 0f7bf3b7183b5fd2f63f92170c3eed76c26bfb8b [diff] |
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into stage-aosp-master am: 0f7bf3b718 -s ours am skip reason: subject contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12803306 Change-Id: I53295ff35b93b6c2f8f888b302e0e08b6e00676d