commit | 1fd9f3a85b9dbdadf36e2680374ec6df0c545541 | [log] [tgz] |
---|---|---|
author | Treehugger Robot <treehugger-gerrit@google.com> | Sat Sep 05 05:57:27 2020 +0000 |
committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Sat Sep 05 05:57:27 2020 +0000 |
tree | 0654f5b9fdcb684df9d17c0ba6ece739517d0c96 | |
parent | dec7d79809e0315d53ad4e0a843a67a19c8fdc77 [diff] | |
parent | 9ebff03fbdc99d867a50f68ce9c2f379913650aa [diff] |
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" am: 5e2016da9a -s ours am: 44d4d1333c -s ours am: 7243e173c1 -s ours am: dc54ae3488 -s ours am: 9ebff03fbd -s ours am skip reason: subject contains skip directive Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1420263 Change-Id: I2b203fe66a595135f5c4b82e4e47e6a2300f62f4