commit | 404bc1e6f6fb594134664d6ef88797b2c6f11e3f | [log] [tgz] |
---|---|---|
author | Treehugger Robot <treehugger-gerrit@google.com> | Fri Sep 04 23:53:44 2020 +0000 |
committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Fri Sep 04 23:53:44 2020 +0000 |
tree | bee7682b401932290b0a8affa3cc0dc1a12c099b | |
parent | 2276d02b22d4f52d47463451c5be6f8da2af3bf6 [diff] | |
parent | 8e0aa0a5f76a8c6897b226c786d8cb33d70027ee [diff] |
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" am: eb3dd3dcc5 -s ours am: 8e0aa0a5f7 -s ours am skip reason: subject contains skip directive Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1419995 Change-Id: I3bd6ae2cabd2fd34da5c621997237ec374848f98