tree 66c0ed78f6719516468fa3d9e16f74d2b0601228
parent 97a4c96fbcc237f0cc1005d2502482e44c09a90c
parent 6ed3fadb22c1a87c8a923a738481df057d5f8211
author Deepanshu Gupta <deepanshu@google.com> 1412242694 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1412242694 +0000

am 6ed3fadb: 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 '6ed3fadb22c1a87c8a923a738481df057d5f8211':
  Build layoutlib create tests as part of sdk build. [DO NOT MERGE]