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]
This commit is contained in: