tree 63ed5d205cc036c21c0c51abfec0d7c364300276
parent 096b2ddd64497e242247693bbd5adc954ba27c38
parent 1f335371e2befbb656a1201b080c4376b3e049d4
author Brian Muramatsu <btmura@google.com> 1360352608 -0800
committer Android Git Automerger <android-git-automerger@android.com> 1360352608 -0800

am 1f335371: am 2b300c87: Merge "DO NOT MERGE Update CTS Verifier to R4" into jb-mr1-dev

# Via Android (Google) Code Review (1) and others
* commit '1f335371e2befbb656a1201b080c4376b3e049d4':
  DO NOT MERGE Update CTS Verifier to R4