tree 56ae63b748d714432aebe30f711e20c5ff5f7366
parent a6e7a9b50d0866fac57447496e4207d91c68c806
parent 311a0f54ac95a1649474498748fff8327b0c917d
author Deepanshu Gupta <deepanshu@google.com> 1427241298 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1427241298 +0000

am 311a0f54: Merge "Fix layoutlib tests." into lmp-dev

* commit '311a0f54ac95a1649474498748fff8327b0c917d':
  Fix layoutlib tests.