commit | a5be4dd6fab55d8fb0c77ca16da5fde33af24332 | [log] [tgz] |
---|---|---|
author | Treehugger Robot <treehugger-gerrit@google.com> | Sat Sep 05 05:49:55 2020 +0000 |
committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Sat Sep 05 05:49:55 2020 +0000 |
tree | d5d8afda55ebbeb886aebc62d0e0bbc6706fac79 | |
parent | 6b872d3a57efa2658331745c4fd6ea24cc3a8c1b [diff] | |
parent | f50ee3be17624a99ee330f5238247f77e519e680 [diff] |
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" am: 83d5c6736f -s ours am: 573559b776 -s ours am: 4df50ef788 -s ours am: f50ee3be17 -s ours am skip reason: subject contains skip directive Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1420267 Change-Id: Ia7a06392c60924fc3d5e4e07e2692fb85ffffba9