tree e7b1ce231a341f903fa0c046f49eed360daa9698
parent 8e9ad191034e932404078069d92b9b6bb74927a1
parent dc85247ab60d58bd191ff57b3a2bfcf052ee8c2a
author Christopher Ferris <cferris@google.com> 1512096179 +0000
committer android-build-merger <android-build-merger@google.com> 1512096179 +0000

Merge "Add new benchmark options."
am: dc85247ab6

Change-Id: I75956886a0a7de4a27186c9ed97d3b4ff4153e97