| commit | 23bd5566767b5147f4d2bc6831a4c5506343065d | [log] [tgz] |
|---|---|---|
| author | Treehugger Robot <treehugger-gerrit@google.com> | Fri Sep 04 22:59:24 2020 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Fri Sep 04 22:59:24 2020 +0000 |
| tree | c9e5cc728e671a5de21b72d7c756453b05db63ef | |
| parent | 04114fadb398cae1568232cae44134abea41f502 [diff] | |
| parent | 2fc4d1bbeea6c6790366ade90783a200ec49d717 [diff] |
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" am: fc2acf1d0b -s ours am: 5ac66184e3 -s ours am: 2fc4d1bbee -s ours am skip reason: subject contains skip directive Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1419993 Change-Id: I3ba3410aaedac3675e16827c3f09de777472afff