tree e1d1aba9fceec9baa5ef3f4e8131a81702dc9c3c
parent 6dd73b45a4b21eba4d1035346cc7870bb01ab621
parent 7bff7e6e8479da18b91e63fb509d46ff4d955462
author Daniel Sandler <dsandler@google.com> 1281121637 -0700
committer Android (Google) Code Review <android-gerrit@google.com> 1281121637 -0700

Merge "Fix startup crash on phones."