tree a9e379232e2f92c24056779996c8a1168a6d4b5f
parent d70d37d6557d6babbc985ddf6a4e8bafd3579f30
parent 0656acf71ab5045a4845a74e9e8c53874ce196fc
author Xavier Ducrohet <xav@google.com> 1404264654 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1404264654 +0000

am 0656acf7: am 55aebda6: Merge "Update the tests to 0.12.2" into idea133 automerge: 601e801

* commit '0656acf71ab5045a4845a74e9e8c53874ce196fc':
  Update the tests to 0.12.2