commit | 56184dbbc1e2e347a907dd32e3bd4563a88016c0 | [log] [tgz] |
---|---|---|
author | Treehugger Robot <treehugger-gerrit@google.com> | Fri Sep 04 13:11:54 2020 +0000 |
committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Fri Sep 04 13:11:54 2020 +0000 |
tree | bee7682b401932290b0a8affa3cc0dc1a12c099b | |
parent | 2549c87669df9eadb537d454896e3dae05f50e7d [diff] | |
parent | f4ea890b6e9f37017b06a61964b22f3d77d616b2 [diff] |
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" am: 4a703c2a7c -s ours am: f4ea890b6e -s ours am skip reason: subject contains skip directive Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1419722 Change-Id: I2effe2cca30e34a04b4bbc03f18bed8beb96ee1e