OSDN Git Service

Merge "Add corresponding error code to fix vts test" into oc-dev
authorShuo Qian <shuoq@google.com>
Tue, 1 Aug 2017 00:25:20 +0000 (00:25 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Tue, 1 Aug 2017 00:25:20 +0000 (00:25 +0000)
am: 417af3a797  -s ours

Change-Id: I98205a431af725626f8f692d9b69d4c4c1f6fe5b


Trivial merge