tree 2ae54894e47dc0d3e84dc48654d02ff08a3edb6f
parent ffdf2234376c5d19c72415369af6fcda8ae25266
parent 2f9218d0c9784d5831a57e45c841e4367d6960a5
author Julia Reynolds <juliacr@google.com> 1530063165 -0700
committer android-build-merger <android-build-merger@google.com> 1530063165 -0700

[automerger skipped] Merge "DO NOT MERGE Log notification interruptions to TRON" into pi-dev am: 694b4ae846
am: 2f9218d0c9  -s ours

Change-Id: I76e583ff5ff890d0f5d3334bf5ad43cb8b084d17