commit | 5718baad64135529db00da7aa57850e7a35e3718 | [log] [tgz] |
---|---|---|
author | TreeHugger Robot <treehugger-gerrit@google.com> | Thu Sep 03 00:53:28 2020 +0000 |
committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Thu Sep 03 00:53:28 2020 +0000 |
tree | 02420875ac4d5c0a78d097d35650ef60908babfc | |
parent | ed22f488404030d2d059dede8d4b7bddee3aa6e1 [diff] | |
parent | bb4b4bdc43568baeb6553a83adb3fc7e8819f797 [diff] |
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into stage-aosp-master am: bb4b4bdc43 -s ours am skip reason: subject contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12508890 Change-Id: Id639a319ee6a93c992096f00b35b37e00bd4dc48