tree 7870d26e387efb65255930fcdeb8d96818ee86b8
parent a8721e70401212af0277a5d90921798014fc4bd5
parent ce6f5c964f56cb9bb670d350da2fa57d3772127b
author Android (Google) Code Review <android-gerrit@google.com> 1248318080 -0700
committer Android (Google) Code Review <android-gerrit@google.com> 1248318080 -0700

Merge change 8298 into donut

* changes:
  Minor NPE fix.