tree 122703526314e3ed4c2ba6f740ad0433dbd676bf
parent 6acadebe8b7a3e498900c9eeceef7e0395768690
parent f1973ae2107b2202cc7a2436ef1cf941cbfd9ff6
author Deepanshu Gupta <deepanshu@google.com> 1396578095 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1396578095 +0000

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