tree 2f96fac103ea71612f4f9dc5355979545214fb02
parent a67eb7d1e4cd0c18d878c0be39c5be76b9e5f803
parent 3edc93266de2e4ed17ac059d3606ac021bbc93ee
author Brian Muramatsu <btmura@google.com> 1363386340 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1363386340 -0700

am 3edc9326: Merge "DO NOT MERGE Update CTS Version to 4.2_r3" into jb-mr1.1-dev

* commit '3edc93266de2e4ed17ac059d3606ac021bbc93ee':
  DO NOT MERGE Update CTS Version to 4.2_r3