tree 9e235aa6b157ad9680eac087ffbde9cbbea9c181
parent c40db82a121936a4bab1ec0803efe4d42910e3a5
parent a59558f476fc04b1f30fba466051718503009977
author Chris Craik <ccraik@google.com> 1335810455 -0700
committer Android (Google) Code Review <android-gerrit@google.com> 1335810455 -0700

Merge "check for null ViewRootImpl" into jb-dev