tree 4e7975860b4d47d66ce1b4cbfb3c1c7ec020ad93
parent 457b8838cb7b9383bbad832ed35e8a58c7b6051b
parent 5bc625d83d60fbb27ab2297051971be91fb3e415
author Deepanshu Gupta <deepanshu@google.com> 1427242108 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1427242108 +0000

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

* commit '5bc625d83d60fbb27ab2297051971be91fb3e415':
  Fix layoutlib tests.