| commit | bd71815c7b3ee5f3ed913534b2ebac7122d14d60 | [log] [tgz] |
|---|---|---|
| author | Treehugger Robot <treehugger-gerrit@google.com> | Fri Sep 04 20:29:54 2020 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Fri Sep 04 20:29:54 2020 +0000 |
| tree | 994f971a7a14401a01a5f09676637d116e3c0ff8 | |
| parent | 821265b102144189375709cffbcf8232747fd342 [diff] | |
| parent | fad6fe50e1b468674ecda402495ba7eeb143ad27 [diff] |
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" am: eddce3d73f -s ours am: fad6fe50e1 -s ours am skip reason: subject contains skip directive Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1420155 Change-Id: I21d4865e18443744e3803a16e2cc9b859413da49