commit | 0ec2984c87ed31547ee2946b1520f3536c0c453d | [log] [tgz] |
---|---|---|
author | Treehugger Robot <treehugger-gerrit@google.com> | Fri Sep 04 19:29:05 2020 +0000 |
committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Fri Sep 04 19:29:05 2020 +0000 |
tree | bee7682b401932290b0a8affa3cc0dc1a12c099b | |
parent | 74cf3b1d1a94e818793eae907e96c90445d82b52 [diff] | |
parent | c14ea7152c3779c1fdcf31d1bd734a8ed286360f [diff] |
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" am: 0a6d531489 -s ours am: c14ea7152c -s ours am skip reason: subject contains skip directive Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1419939 Change-Id: Iaacb1e55408d2312ac3bc917228bc609717649d1