| commit | 8bc164e4939749f566ca56455c7ceb7f3e65f2ce | [log] [tgz] |
|---|---|---|
| author | TreeHugger Robot <treehugger-gerrit@google.com> | Wed Sep 02 19:14:50 2020 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Wed Sep 02 19:14:50 2020 +0000 |
| tree | 7cd49368d5c807f0230d697672a27df038af1f0d | |
| parent | 55dde9a68376c99f6eb0ff324eb8d77ad52b5658 [diff] | |
| parent | bf9c988a604e52054d9e7ab29a03f3862e7f921d [diff] |
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into stage-aosp-master am: 14a9e208c7 -s ours am: 424cf3e399 -s ours am: bf9c988a60 -s ours am skip reason: subject contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12509747 Change-Id: I82518e30763e4a5ce6029afae981480e2a33472c