OSDN Git Service

Merge "Fix robolectric test failure" into oc-dev am: 2545bcaa74
authorFan Zhang <zhfan@google.com>
Thu, 18 May 2017 01:09:16 +0000 (01:09 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Thu, 18 May 2017 01:09:16 +0000 (01:09 +0000)
commit63c5b41f01236e782e4c59c48f5df89b8048eb25
treeefdf76a7ee8ad72c4adfe0cace21d29aaf08fa74
parent1bceb954ed6871d27e9c00f8d9ea7cc83a61353a
parent3970916cf19405777c3b197f5086547f92d1520f
Merge "Fix robolectric test failure" into oc-dev am: 2545bcaa74
am: 3970916cf1

Change-Id: I7f63f5cee9a91c8f88711a0ada04a24a676692f1