tree 81af27ca604587d1a56e881c2022d0b5c32edd37
parent fbcab05c2b22d16d9a5241114590b6001cd164d3
parent 8d060f2703359c58a7253ecb59d56244ab93ba12
author Aart Bik <ajcbik@google.com> 1437677844 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1437677844 +0000

am 8d060f27: am c20d7286: Merge "Replaced CHECK with EXPECT in tests."

* commit '8d060f2703359c58a7253ecb59d56244ab93ba12':
  Replaced CHECK with EXPECT in tests.