OSDN Git Service

Merge "Fix test failure" into oc-dr1-dev
authorJason Monk <jmonk@google.com>
Fri, 30 Jun 2017 15:23:52 +0000 (15:23 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Fri, 30 Jun 2017 15:23:52 +0000 (15:23 +0000)
am: a9c3d283df

Change-Id: Ibbec4701dca82d9c271e8ff25d25cbe2df8da816


Trivial merge