tree c5b6447d389b6d769b891dd64af4b091ea0afc41
parent 862e0fe25baee340b3ed04417bdd6c251e59067b
parent 6403eac9ea2b3e713b61d5d7c8af43ca33927f82
author Nicholas Sauer <nicksauer@google.com> 1398879496 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1398879496 +0000

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

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