commit | bd75f52a7bf41e658a3b5f4ebd48efe872445508 | [log] [tgz] |
---|---|---|
author | TreeHugger Robot <treehugger-gerrit@google.com> | Thu Sep 03 06:55:30 2020 +0000 |
committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Thu Sep 03 06:55:30 2020 +0000 |
tree | 26da2b660044f205549652cbf2aa2abf47f06e3d | |
parent | e669aa4657908d5cd03606f0cd4bd3b29cf1338b [diff] | |
parent | 02204628e5520e731552858ad6499eab7c3f0f84 [diff] |
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into stage-aosp-master am: cc822e170a -s ours am: cd4a8cbf2e -s ours am: 02204628e5 -s ours am skip reason: subject contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12513073 Change-Id: I83816eaae7357d0f059dc486c8b20ee5c3056d98