tree 4e163618c234e61d5b5252064659766a87f67037
parent 7349e63d112838e3c925e03b6e1f99fdb95b1f6c
parent 75f2f993392a3903d160e7fed81c0b7ff5cf76f1
author Deepanshu Gupta <deepanshu@google.com> 1412242221 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1412242221 +0000

am 75f2f993: am 925abb6d: (-s ours) am 891f38d1: Merge "Build layoutlib create tests as part of sdk build. [DO NOT MERGE]" into klp-modular-dev

* commit '75f2f993392a3903d160e7fed81c0b7ff5cf76f1':
  Build layoutlib create tests as part of sdk build. [DO NOT MERGE]