am a1cca5cb: am 29b4986e: (-s ours) am 5c77c126: am b6588c52: Merge "Fix NPE in layoutlib. [DO NOT MERGE]" into jb-mr2-dev
* commit 'a1cca5cb0b7ad982983aebac980c4a44827e7eb3': Fix NPE in layoutlib. [DO NOT MERGE]
This commit is contained in: