tree 559f2f5c675229fed6ff234ddfb5ac5d1f353986
parent e053d2dbc99e8470556eb9586d3a9cbb9e4b474b
parent c94170d4ad510feca70f768548ab76ea9dd1a606
author Brian Muramatsu <btmura@android.com> 1294789680 -0800
committer Android Git Automerger <android-git-automerger@android.com> 1294789680 -0800

am c94170d4: Merge "Use getAssets().getLocales() to compare with en_US." into froyo

* commit 'c94170d4ad510feca70f768548ab76ea9dd1a606':
  Use getAssets().getLocales() to compare with en_US.