tree 44564b33a5df8d5e25cc1064e44f2ea183250c11
parent 4541c7cf3231e1e52a4b3b1bb9cf8764bbd5642a
parent b81038da92f355c57b655c508003e4e179fdba60
author Nicholas Sauer <nicksauer@google.com> 1398878145 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1398878145 +0000

am b81038da: Merge "DO NOT MERGE Update JB cts and verifier version" into jb-dev

* commit 'b81038da92f355c57b655c508003e4e179fdba60':
  DO NOT MERGE Update JB cts and verifier version