tree d10bfb60daa26a6b22f817a5ef86143cd56fd142
parent ee88c5910a50ea6daa43feb2870f21466924edd8
parent 8b38cd7ff63bcd38266b4fdb26ca993e3090b5dd
author Deepanshu Gupta <deepanshu@google.com> 1396581591 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1396581591 +0000

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

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