OSDN Git Service

Merge "Fix robotests." into oc-dr1-dev
authorAndrew Sapperstein <asapperstein@google.com>
Tue, 25 Jul 2017 23:50:57 +0000 (23:50 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Tue, 25 Jul 2017 23:50:57 +0000 (23:50 +0000)
commitc38502ba593a9761cbf7ee959d01a2680aa37635
tree8bc6ac019b6f230098b4895733c2b7ed68009c6f
parentfba88cc7c0792babd294450f44b313a4eebb3c05
parentb5696a9162f201e3e90e14db67cc67a5884b0948
Merge "Fix robotests." into oc-dr1-dev
am: b5696a9162  -s ours

Change-Id: Ibce6e5a08dffeab7779718d99d2cc7ad60c5586b