tree 86793c477e5bd8fb24ee82b7e2f20927a0a1c983
parent 04b30fa00b5ae9c05c307dbfa2ba7d8028402999
parent a98a9b30bea74478b9d1b3f16e3713f5c864e648
author Deepanshu Gupta <deepanshu@google.com> 1420675438 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1420675438 +0000

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

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