tree 059eaad8ba007ee21b53342a8138f85fff589710
parent a74b51ebafc7fa5e43afd9332c9084e1c894e23f
parent 0d3803f3f26de3c17dd75e6f9fae81d513017b5f
author Dan Shi <dshi@google.com> 1491448584 +0000
committer android-build-merger <android-build-merger@google.com> 1491448584 +0000

Merge "Add test config to bootstat_tests" am: 3d5cd59d73 am: 5358155528
am: 0d3803f3f2

Change-Id: I41c3015bb4048fd526b83487de2c574651ea79e0