Merge "Use buffer to log media timeout events" into tm-dev am: 6037653177 am: e66d028cf3 am: bfbb01ebd7
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17900544 Change-Id: I269fc13efdcfadf1782668bd5cb2981f3a271442 Ignore-AOSP-First: this is an automerge Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in: