tree ad0f6e6006ddeb3b24e08d56646d0aa340825607
parent ff87f54349351571b8e81835fbaa2e02d17f0e9f
parent e9a5488e1a2c49e67da47fc54a0a98a7ef9879c5
author Adam Powell <adamp@google.com> 1286247575 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1286247575 -0700

am 1c2911a6: Merge "Fix bug 3061769" into gingerbread

Merge commit '1c2911a648bdf5b2d8978ce96756ae82b7d452bd' into gingerbread-plus-aosp

* commit '1c2911a648bdf5b2d8978ce96756ae82b7d452bd':
  Fix bug 3061769