tree 708a77aa7c895697d462fa5a0878806d4be73f0c
parent 7e4c1a92b8f3ce02df0a1502be45c450308d81b7
parent 1f8e3de40c0aed9fa8b9216ddd3224b7ac94acf1
author Deepanshu Gupta <deepanshu@google.com> 1430956417 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1430956417 +0000

am 1f8e3de4: Merge "More layoutlib tests." into lmp-mr1-dev

* commit '1f8e3de40c0aed9fa8b9216ddd3224b7ac94acf1':
  More layoutlib tests.