tree 9e34129dba00354c7e2ab5d57cd43278036d2b89
parent 0e13957a4deab3a90492d9ae2f6d35d3b5c1773e
parent 3bd33f1d9e8af826fa95095ca391d40f6c75ca2a
author Deepanshu Gupta <deepanshu@google.com> 1420659963 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1420659963 +0000

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

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