tree 06ea1d7a31dad770afc4ad41ba5d58b2b7447066
parent ca0c1a3c516c8485e0ab3255520c68e064a92fc4
parent f48fd822e055da272f9e821db56db98591a35cfe
author Daniel Sandler <dsandler@google.com> 1312510549 -0700
committer Android (Google) Code Review <android-gerrit@google.com> 1312510549 -0700

Merge "Fix another NPE."