tree 3aaafae78a7283c9a4f717ac6c0e130bb673453e
parent 77596103b82939887901b04c9a46fab746ad63a7
parent 29b4986ecce1592bd2fe62024bb187dded33c0af
author Deepanshu Gupta <deepanshu@google.com> 1396577256 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1396577256 +0000

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

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