OSDN Git Service

Merge "Update code and add a way to benchmark traces." am: e305e7fef7
authorChristopher Ferris <cferris@google.com>
Thu, 6 Jun 2019 04:22:43 +0000 (21:22 -0700)
committerandroid-build-merger <android-build-merger@google.com>
Thu, 6 Jun 2019 04:22:43 +0000 (21:22 -0700)
am: 764a565479

Change-Id: Ie296b11fb2b3f5bf77a655e09e6e49deb92713c0


Trivial merge