commit | ad1a9ef540af00dd024d10605b07993f7ebf10c0 | [log] [tgz] |
---|---|---|
author | Treehugger Robot <treehugger-gerrit@google.com> | Fri Sep 04 13:51:54 2020 +0000 |
committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Fri Sep 04 13:51:54 2020 +0000 |
tree | d5d8afda55ebbeb886aebc62d0e0bbc6706fac79 | |
parent | 89dc04ff76db168ba1319a30a0b38b657038db4a [diff] | |
parent | b7287f8ded9c2579d969f0cff95d07898b899ec4 [diff] |
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" am: a6dc548d57 -s ours am: c17566dbd3 -s ours am: b8d140375c -s ours am: b7287f8ded -s ours am skip reason: subject contains skip directive Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1419721 Change-Id: I1d560aadaa656a036fd72cf90189833a12bc8d2b