tree e486f34b1bffcd8779345b3e81f27066d2c4ce2e
parent e3f6a45f804eb870023158a1d98041b2daab0b7e
parent 3bec397e50656fe35ed2c6d09bcaf1b2c9d0f406
author James Hawkins <jhawkins@google.com> 1487038623 +0000
committer android-build-merger <android-build-merger@google.com> 1487038623 +0000

Merge "libmetricslogger: Use libBionicGtestMain instead of a custom test runner." am: 07e57b4b25 am: 1715ee2854
am: 3bec397e50

Change-Id: I4d172ce894f64531734e6c87a64c543edc5bbe7a