OSDN Git Service

Merge "Fix robolectric test failure" into oc-dev
authorFan Zhang <zhfan@google.com>
Thu, 18 May 2017 01:01:12 +0000 (01:01 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Thu, 18 May 2017 01:01:12 +0000 (01:01 +0000)
commit3970916cf19405777c3b197f5086547f92d1520f
treeab8c3444fa752c51147088db5b0245167cc93397
parentc6b1845d0f203586fb406ad2c5db454150bc68b9
parent2545bcaa744b388cf8b0165a7934d7f5ece80e97
Merge "Fix robolectric test failure" into oc-dev
am: 2545bcaa74

Change-Id: I632edffaced0b4ce7d391d525c4d9288e5ba97cc