tree 977c9333d0087e3c777f10040ded0c04e5d19738
parent 356854dee09c3a1263b9ac72173bd97861981338
parent 5944c3f0427e077f214ffa8b0193e430aeef9b68
author Winson Chung <winsonc@google.com> 1316638311 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1316638311 -0700

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

* commit '5944c3f0427e077f214ffa8b0193e430aeef9b68':
  Use American spelling.