Merge "Add corresponding error code to fix vts test" into oc-dev am: 417af3a797 -s ours am: ec37054b9e -s ours

am: 1ab1eabf7c  -s ours

Change-Id: I06925657c1df3f5d1fda30bc8d5ac855c01904f3
This commit is contained in:
Shuo Qian 2017-08-01 00:31:21 +00:00 committed by android-build-merger
commit 823c026a85

Diff content is not available