tree 977c9333d0087e3c777f10040ded0c04e5d19738
parent 06ce0123201182ace64f136778ce9e38d78ab444
parent 12b6dc0063409015827938c54237beb2700b6cad
author Winson Chung <winsonc@google.com> 1316638245 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1316638245 -0700

am 12b6dc00: Merge "Use American spelling." into ics-factoryrom

* commit '12b6dc0063409015827938c54237beb2700b6cad':
  Use American spelling.