commit | 1fd37d5d585938d505642a2c14fedd9bf4058baa | [log] [tgz] |
---|---|---|
author | Treehugger Robot <treehugger-gerrit@google.com> | Sat Sep 05 05:58:23 2020 +0000 |
committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Sat Sep 05 05:58:23 2020 +0000 |
tree | 4ff56bde1d82e854b68b88e14125510cd2de0608 | |
parent | 9db48416afc2011c210b49d974dc14c29944bcf1 [diff] | |
parent | a5be4dd6fab55d8fb0c77ca16da5fde33af24332 [diff] |
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" am: 83d5c6736f -s ours am: 573559b776 -s ours am: 4df50ef788 -s ours am: f50ee3be17 -s ours am: a5be4dd6fa -s ours am skip reason: subject contains skip directive Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1420267 Change-Id: I88525c877f6c7f86c81d206029905b1415d9ab09