tree 915a1df70197f122c5fcfce34097dd39490ed401
parent f3603fe93a6a3b2002384415fbd555dd3cd2e538
parent 2deb31ffbe4ce6fc3552f35847b2e02a0d938f1e
author Deepanshu Gupta <deepanshu@google.com> 1396578393 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1396578393 +0000

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 '2deb31ffbe4ce6fc3552f35847b2e02a0d938f1e':
  Fix NPE in layoutlib. [DO NOT MERGE]