Merge "Merge "Add corresponding error code to fix vts test" into oc-dev am: 417af3a797 am: 2ad5aecc2e -s ours" into oc-dr1-dev-plus-aosp

am: ba1ac6f722  -s ours

Change-Id: I256fb0b8fa11848e9c89f41c0a29cb5dc5e02a14
This commit is contained in:
Shuo Qian 2017-08-01 00:31:21 +00:00 committed by android-build-merger
commit 47a419aefd

Diff content is not available