Merge commit '1028accb55919c0a84a4871002efb19a202c475c' into eclair-plus-aosp * commit '1028accb55919c0a84a4871002efb19a202c475c': Fix NPE when opening new layout file.
Merge commit '1028accb55919c0a84a4871002efb19a202c475c' into eclair-plus-aosp * commit '1028accb55919c0a84a4871002efb19a202c475c': Fix NPE when opening new layout file.