OSDN Git Service

Merge "Fix broken robotests." into oc-dr1-dev am: a048e3c03f am: dbb97833c6
authorSundeep Ghuman <sghuman@google.com>
Tue, 1 Aug 2017 23:26:39 +0000 (23:26 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Tue, 1 Aug 2017 23:26:39 +0000 (23:26 +0000)
am: 4150fbacc8

Change-Id: I5098e205386b3f25e8bb573115fdec14654d9bdd


Trivial merge