tree b386f59269a264ee6378e2fa48bccf1a8cec9719
parent 253a352f8c351201781fe5e677ddc588b3527a95
parent 599105a92ceb24f0f09beb11be18126ae4e8efdf
author Deepanshu Gupta <deepanshu@google.com> 1384798307 -0800
committer Android Git Automerger <android-git-automerger@android.com> 1384798307 -0800

am 599105a9: Merge "Fix NPE in layoutlib. DO NOT MERGE" into klp-dev

* commit '599105a92ceb24f0f09beb11be18126ae4e8efdf':
  Fix NPE in layoutlib. DO NOT MERGE