OSDN Git Service

Merge "Fix CHA test failures under some configurations."
authorMingyao Yang <mingyao@google.com>
Wed, 19 Apr 2017 18:03:51 +0000 (18:03 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Wed, 19 Apr 2017 18:03:51 +0000 (18:03 +0000)
am: 59715029ae

Change-Id: I2b3f997173ad4a99470333b2d1c7c5dc4ec15b6f


Trivial merge