tree 3cc6008cd4c2c2a2de8cfdb8abb910c312dfc041
parent 97b7b8637bc50cbcd9ad9a63fcb34355439b0701
parent 0b1188e3c1ff6c814dc64c51c83b19afa36d8ce9
author Deepanshu Gupta <deepanshu@google.com> 1420674789 +0000
committer android-build-merger <android-build-merger@google.com> 1420674789 +0000

am 3bd33f1d: Merge "Fix tests on jenkins, take 2." into lmp-dev
automerge: 0b1188e

* commit '0b1188e3c1ff6c814dc64c51c83b19afa36d8ce9':
  Fix tests on jenkins, take 2.