tree 2adda21766e2d8a68ad51f19f77775a8e23a1c3d
parent 112852b5770300a81d82f0ec06ad0553f286ed01
parent 039aa81a67465f189c24f92567ccb08ed8a5dce2
author Teng-Hui Zhu <ztenghui@google.com> 1300756401 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1300756401 -0700

am 039aa81a: Merge "Fix a crash" into honeycomb-mr1

* commit '039aa81a67465f189c24f92567ccb08ed8a5dce2':
  Fix a crash