OSDN Git Service

Merge "Fix robotests." into oc-dr1-dev am: b5696a9162 -s ours
authorAndrew Sapperstein <asapperstein@google.com>
Tue, 25 Jul 2017 23:55:07 +0000 (23:55 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Tue, 25 Jul 2017 23:55:07 +0000 (23:55 +0000)
commit7a10210981ce48f63c7da346f0792acb93b69716
treef37fb84429b3f5e74cc619e5d7b009d8c231eb8a
parent5d8467a068358e7b9a5fb0a0e8d8dfbe9b90c592
parentc38502ba593a9761cbf7ee959d01a2680aa37635
Merge "Fix robotests." into oc-dr1-dev am: b5696a9162  -s ours
am: c38502ba59  -s ours

Change-Id: I645dc753076e4f5be876338484979ca890bd9a2d