tree 01af91b7ea63c6d4f61ae9db408051c1683394d3
parent 43a80fd806247cb50e81bacda3ad21d210e9ae88
parent 8a626914e388a57c2378c86e82b24158d6098330
author Owen Lin <owenlin@google.com> 1337286941 -0700
committer Android (Google) Code Review <android-gerrit@google.com> 1337286941 -0700

Merge "Fix a NPE found by Moneky." into jb-dev