am 882ac0f0: am 9358ae91: (-s ours) am 69386e33: am 81fd50c3: Merge "perfboot.py: ignore tags not listed in /system/etc/event-log-tags"

* commit '882ac0f0ca541482035cb678e6eb5c67a490ef7a':