| commit | c949cf096a9a6b5e745c5e99533f6915646a46e1 | [log] [tgz] |
|---|---|---|
| author | TreeHugger Robot <treehugger-gerrit@google.com> | Thu Sep 03 07:26:07 2020 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Thu Sep 03 07:26:07 2020 +0000 |
| tree | 3a87da8c1b0e6643b38554e2577301a6b992995b | |
| parent | 5ee3da92bb90e338e3c95d2e1ac7ce91e8b9fed5 [diff] | |
| parent | 3fe9ef5c4ece56aa8cade6132b2360db02f2917d [diff] |
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into stage-aosp-master am: e7c8fcb8c5 -s ours am: 81ed4d7250 -s ours am: 828a6a935e -s ours am: 3fe9ef5c4e -s ours am skip reason: subject contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12518323 Change-Id: I9ca9fafbf764bbbfb16ea2e666ba4f1b3b2704fd