OSDN Git Service

Merge "Track google-benchmark API change." am: 239663cf97 am: e2feba2535 am: 4b093246ca
authorElliott Hughes <enh@google.com>
Sat, 22 Jul 2017 01:25:49 +0000 (01:25 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Sat, 22 Jul 2017 01:25:49 +0000 (01:25 +0000)
commit1be227f219db5a8214fe5cc538a878e419cc1d27
treef27ce93bd690425cd2b5fbd49444b429313d32ed
parent3efdaeb4db243ee793f3946fcd7b0594d73a57bf
parent1e83be4c628b2654225074b393ca98dcc1c5dc39
Merge "Track google-benchmark API change." am: 239663cf97 am: e2feba2535 am: 4b093246ca
am: 1e83be4c62

Change-Id: Ia8059b8c19c866b3a6f28affec6a65399af009cd