tree e7a4cdb0636d9590c2b80be855d7c440ea1b45a4
parent f4bb1cdecd3cf866a1d87b7b8560234fa7dd4cc5
parent 19e0fc53c43a7746d7ae3d7c6027166bded33f0f
author Michael Jurka <mikejurka@google.com> 1311626338 -0700
committer Android (Google) Code Review <android-gerrit@google.com> 1311626338 -0700

Merge "Fix two crashes"