| commit | 8409420629bd00be0a2e0c4103340129ef3f6c3a | [log] [tgz] |
|---|---|---|
| author | Treehugger Robot <treehugger-gerrit@google.com> | Sun Sep 06 03:55:31 2020 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Sun Sep 06 03:55:31 2020 +0000 |
| tree | 4ff56bde1d82e854b68b88e14125510cd2de0608 | |
| parent | 1150a52483b654c0b5ee69f4b908545cb70e3302 [diff] | |
| parent | 4062a506b7020ace0e687c4e7f03168898a14b94 [diff] |
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" am: 70d09036bd -s ours am: 70e59c5f79 -s ours am: bf3a6ed0f8 -s ours am: ffe7d2fbba -s ours am: 4062a506b7 -s ours am skip reason: subject contains skip directive Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1420508 Change-Id: Ibfe40bcd4d80662a9e26a61db4104238dbefa20f