tree a9e379232e2f92c24056779996c8a1168a6d4b5f
parent 1b5bf8f4e1ca18539c7424fbe4b8883e83aa8fba
parent 601e801b7f12dbf1b0c4c3697b4b3849be57f79b
author Xavier Ducrohet <xav@google.com> 1404263710 +0000
committer android-build-merger <android-build-merger@google.com> 1404263710 +0000

Merge "Update the tests to 0.12.2" into idea133
automerge: 601e801

* commit '601e801b7f12dbf1b0c4c3697b4b3849be57f79b':
  Update the tests to 0.12.2