commit | 01a0745efd93564c6db8dfe1497a5e3370adcb82 | [log] [tgz] |
---|---|---|
author | Treehugger Robot <treehugger-gerrit@google.com> | Sun Dec 06 16:15:02 2020 +0000 |
committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Sun Dec 06 16:15:02 2020 +0000 |
tree | 7652ac3d66acf9b55fe6815121dd2219e2c8716a | |
parent | c2605fa581385df9f28214f4edf477ede4129298 [diff] | |
parent | 7b6d6070bc7edc6aa42d6d15695cf2244bb370ce [diff] |
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" am: dbd5232609 -s ours am: 7b6d6070bc -s ours am skip reason: subject contains skip directive Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1519353 Change-Id: I5ad37cea367eb14bb672610179fb8bf2a515e9ab