Merge commit '944808f392e416858e3265b14b9e0a4410a1dbbf' into eclair-plus-aosp * commit '944808f392e416858e3265b14b9e0a4410a1dbbf': Fix a possible NPE in View.
Merge commit '944808f392e416858e3265b14b9e0a4410a1dbbf' into eclair-plus-aosp * commit '944808f392e416858e3265b14b9e0a4410a1dbbf': Fix a possible NPE in View.