tree cab0b7f06182126b59ae0eea15153a6b6b5aba09
parent f4de9d84e0b761383a478c7dfc9f54b44e1020f5
parent 302fd33356a5e2d984a947755fbe710fe90e5aa4
author Brian Muramatsu <btmura@google.com> 1359665309 -0800
committer Android Git Automerger <android-git-automerger@android.com> 1359665309 -0800

am 302fd333: DO NOT MERGE Update CTS Verifier to R5

# Via Brian Muramatsu
* commit '302fd33356a5e2d984a947755fbe710fe90e5aa4':
  DO NOT MERGE Update CTS Verifier to R5