commit | 1a2608e635bef59636ed8e8db69a4992590d8dcd | [log] [tgz] |
---|---|---|
author | Treehugger Robot <treehugger-gerrit@google.com> | Sat Dec 05 22:19:41 2020 +0000 |
committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Sat Dec 05 22:19:41 2020 +0000 |
tree | e1fd5c9113c23e3dfe3dd13a402374634a65a958 | |
parent | 8bc0d593334b337b3f1be21d965fd15a8eed820c [diff] | |
parent | 756ef7c5e703fcfe7b9b58ee54667304330bc792 [diff] |
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" am: 8136182dcd -s ours am: 468874dd4f -s ours am: 756ef7c5e7 -s ours am skip reason: subject contains skip directive Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1519189 Change-Id: I54958a9ab524dea32a74a662a518dadc2fc05daf