commit | 996d53d15ee63d47bd193c11b4f3dc0973bea035 | [log] [tgz] |
---|---|---|
author | Treehugger Robot <treehugger-gerrit@google.com> | Sun Sep 06 07:49:53 2020 +0000 |
committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Sun Sep 06 07:49:53 2020 +0000 |
tree | 0654f5b9fdcb684df9d17c0ba6ece739517d0c96 | |
parent | 1fd9f3a85b9dbdadf36e2680374ec6df0c545541 [diff] | |
parent | c83088774cada1efa427aeb8fff6db8bdd96314c [diff] |
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" am: 5db7c0028c -s ours am: 097abd5f98 -s ours am: c6ac3642f3 -s ours am: 539f9c66da -s ours am: c83088774c -s ours am skip reason: subject contains skip directive Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1420007 Change-Id: Icc2f248067d04527e9625f48e8aeb7ac0fed6c5f