OSDN Git Service

Merge changes I4b58610f,Ib758756a into oc-dev
authorTreeHugger Robot <treehugger-gerrit@google.com>
Wed, 31 May 2017 01:07:21 +0000 (01:07 +0000)
committerAndroid (Google) Code Review <android-gerrit@google.com>
Wed, 31 May 2017 01:07:27 +0000 (01:07 +0000)
commita9873bc8f6df680463f410a8f0f27b9465c9334e
treec83d90abe5a1007f9e1dedae8d619d44e21375a3
parent13eef357d6f22ff29d47239e8c6cf72ad1f417c3
parentc91663674c07781864a062bf9164ec3853269bfb
Merge changes I4b58610f,Ib758756a into oc-dev

* changes:
  Turn off the check in the test because the assertion is off in the implementation.
  Fix typos that cause infinite recursion and CTS test failure.