tree dcc6cccf22009d510db6d7476e3cb808d8bde3b5
parent ef9f3043f5259fa55376a1522152779295e15da6
parent b6588c522451f5015c2cbc902d5a72566f979f2b
author Deepanshu Gupta <deepanshu@google.com> 1396576445 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1396576445 +0000

am b6588c52: Merge "Fix NPE in layoutlib. [DO NOT MERGE]" into jb-mr2-dev

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