tree 43bd56cb7a301a446e9c41984ee749c5096adceb
parent 837d9e0110a0c6c7db6ede911c1374e8bc435138
parent d4ae64b9ea5a247bdd9d36507e3db04f4b842b91
author Jeffrey Huang <jeffreyhuang@google.com> 1602281607 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1602281607 +0000

[automerger skipped] Merge "Fix print-logs" into mainline-prod am: d4ae64b9ea -s ours

am skip reason: Change-Id I2201fc0538876d1d6dfd6ab7abfac43cccc1102f with SHA-1 432f3705a9 is in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12804375

Change-Id: Ib3c4bb9ed6caaac43a6dc2f72d542a2dbdcaaa76