tree 17a682185e9cc04d80e4dfd6b2d1f274de421ce4
parent 25b49734cac1ecd17dba2af2a1af8328490236d4
parent 7987a3172b0502ea70a26d80e7cd16ca7e460035
author Satoshi Kataoka <satok@google.com> 1366256019 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 1366256019 +0000

Merge "Fix possible NPE" into jb-mr2-dev