OSDN Git Service

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

Change-Id: I46bbc7f6d9d4f4238a2d528abc88d2a87fd25f74


Trivial merge