tree a9e379232e2f92c24056779996c8a1168a6d4b5f
parent 86bf4abd76eb924cb9eae646eb73b6d301769f50
parent 55aebda607efcc29b8d9d5e1a99d446e320ff288
author Xavier Ducrohet <xav@google.com> 1404264284 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1404264284 +0000

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

* commit '55aebda607efcc29b8d9d5e1a99d446e320ff288':
  Update the tests to 0.12.2