tree 06d863dc98d9410be6ba4b95a0e441baf4f6af3a
parent 704c3b90ede7e09f907c0e707fc7f89070e2de08
parent 6a3faf5a8b182d20dea47fb76cf33456321ddf7a
author Raluca Sauciuc <ralucas@google.com> 1412637746 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1412637746 +0000

am 6a3faf5a: Merge "Fix test framework to allow Mockito tests to run successfully on ART." into lmp-dev

* commit '6a3faf5a8b182d20dea47fb76cf33456321ddf7a':
  Fix test framework to allow Mockito tests to run successfully on ART.