tree dfadc428e68face8b0747cc87c83493df578088e
parent eb4ef07223030eb61d8cf99771e657b7fc0108d0
parent c491ee02237fc5c0e6a4ad81ebc899d97c9778b5
author Wink Saville <wink@google.com> 1286997425 -0700
committer Android (Google) Code Review <android-gerrit@google.com> 1286997425 -0700

Merge "Fix NPE caused by Change I4df27119." into gingerbread