tree a3664199436dd2ff62602ddc304b25ff193bfaf9
parent 76caf3d874c5d29e3f80d1a9e4733ba211acb4ac
parent ec37054b9e369f06adb34124c1465d480c8fdc3d
author Shuo Qian <shuoq@google.com> 1501547273 +0000
committer android-build-merger <android-build-merger@google.com> 1501547273 +0000

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

Change-Id: I8f854a94599c2ef407093859da15abd7d12adae9