tree aca9ca4b5dc3b090e6fd76615154c59df4271c8f
parent ce21c69b2a926c5ad22b8178e6c02c040309a827
parent 42453ede3335aa5f7007a5b36749e84df83a08d4
author Deepanshu Gupta <deepanshu@google.com> 1384798540 -0800
committer Android Git Automerger <android-git-automerger@android.com> 1384798540 -0800

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

* commit '42453ede3335aa5f7007a5b36749e84df83a08d4':
  Fix NPE in layoutlib. DO NOT MERGE