am 20d83054: Merge "Fix LocationTest to Support More Locales" into gingerbread

* commit '20d83054c23791ec72292c6c10d2593e575359d5':
  Fix LocationTest to Support More Locales