tree 485b152b97bf8321fdd223f35587bb4294672be8
parent 198d540688c7d13ffc04f3e2526bb837a16da9ce
parent 98f6fa54aca538bddba43d9e979723d808df63b4
author Pin Ting <pinting@google.com> 1326164416 -0800
committer Android Git Automerger <android-git-automerger@android.com> 1326164416 -0800

am 497661d3: Merge "Fixes typo." into ics-mr1

* commit '497661d309ea960aa9723ef4e0d064b56515b566':
  Fixes typo.