tree ac3ed0a42dd685770ea0046b8aa17cab9710b10a
parent 74ad989de6e5d62791edf15ebdbe45194cba3530
parent a1cca5cb0b7ad982983aebac980c4a44827e7eb3
author Deepanshu Gupta <deepanshu@google.com> 1396577644 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1396577644 +0000

am a1cca5cb: am 29b4986e: (-s ours) am 5c77c126: am b6588c52: Merge "Fix NPE in layoutlib. [DO NOT MERGE]" into jb-mr2-dev

* commit 'a1cca5cb0b7ad982983aebac980c4a44827e7eb3':
  Fix NPE in layoutlib. [DO NOT MERGE]