OSDN Git Service

Merge "Fix robotests." into oc-mr1-dev
authorAndrew Sapperstein <asapperstein@google.com>
Tue, 25 Jul 2017 23:47:00 +0000 (23:47 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Tue, 25 Jul 2017 23:47:00 +0000 (23:47 +0000)
commit2bdae81acab1231e9646e5aedcf7e3743680740b
tree0694e3d7ba572e1ee02b2a41e789432ee5c4125c
parentd8ed5645bef0655852a4c1f668c2a605c09375e8
parent205857726a6141665f619d8b465bace86d403e55
Merge "Fix robotests." into oc-mr1-dev
am: 205857726a

Change-Id: I4f04275f7a6d71d3a19b6b8bf2540af4debdd76e