| commit | 9db48416afc2011c210b49d974dc14c29944bcf1 | [log] [tgz] |
|---|---|---|
| author | Treehugger Robot <treehugger-gerrit@google.com> | Sat Sep 05 05:58:10 2020 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Sat Sep 05 05:58:10 2020 +0000 |
| tree | 4ff56bde1d82e854b68b88e14125510cd2de0608 | |
| parent | ef6585b5a88fdc36fb1d87461b0d080cd7042c06 [diff] | |
| parent | 6b872d3a57efa2658331745c4fd6ea24cc3a8c1b [diff] |
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" am: 61298b480c -s ours am: 6da5b0de3d -s ours am: efb5c312d4 -s ours am: 725d9537a1 -s ours am: 6b872d3a57 -s ours am skip reason: subject contains skip directive Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1420260 Change-Id: I2561f845f8252728cd9b2acf525ae6eca6d228e9