tree 7ccd51105e267801d9ede683d29f726f407dcaea
parent b5b2e77ad9de88e0f9573836d6d0acad7ad99996
parent 85ff81cba22d18e0e68c3061f355f55813c74496
author Ray Essick <essick@google.com> 1565380254 -0700
committer android-build-merger <android-build-merger@google.com> 1565380254 -0700

Merge "Merge "make perf-measuring code safe across SDK levels" into qt-dev am: f4a034c42c am: 87ab083ade am: 64b6e6d334" into qt-qpr1-dev-plus-aosp
am: 85ff81cba2

Change-Id: I1ae763172664111afb9631cde755a6417cebaa4a