| commit | 161dfbf4673a58b3b5ad14e31197783b8d59c1ec | [log] [tgz] |
|---|---|---|
| author | Treehugger Robot <treehugger-gerrit@google.com> | Sat Sep 05 14:19:13 2020 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Sat Sep 05 14:19:13 2020 +0000 |
| tree | bee7682b401932290b0a8affa3cc0dc1a12c099b | |
| parent | 4ebbcff41b9e20499c4ba0cb9625b9cd96e707f4 [diff] | |
| parent | 32bcd973255e501afe78a380f964b08cc3e2a030 [diff] |
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" am: 730089156f -s ours am: 32bcd97325 -s ours am skip reason: subject contains skip directive Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1420418 Change-Id: I3195d63d621ef3496f53f86c8d37e00bd85cbeb4