OSDN Git Service

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

Change-Id: I73941a7f22d70380a7239c78e1f6628e0d456470


Trivial merge