tree 3a3e8b93d010e337d289c228cd6109a2ba412d93
parent 10eea1e2774079b9dc9d99f3df6f6f83498331aa
parent 425981524ad3925284b2c4ac9c568d77c582cecc
author James Dong <jdong@google.com> 1284143124 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1284143124 -0700

am 4709c7fa: Merge "Fixed a copy and paste error" into gingerbread

Merge commit '4709c7faaa7d14b136dd3b1d8126f972ee11a1aa' into gingerbread-plus-aosp

* commit '4709c7faaa7d14b136dd3b1d8126f972ee11a1aa':
  Fixed a copy and paste error