Eric Fischer 8e2193c6d0 am 4d9d75a4: Import revised translations. DO NOT MERGE ...

Merge commit '4d9d75a42471ca65670fd2adc80d37bca43a69f6' into gingerbread-plus-aosp

* commit '4d9d75a42471ca65670fd2adc80d37bca43a69f6':
  Import revised translations.  DO NOT MERGE

2010-08-04 10:59:25 -07:00

..

res

am 4d9d75a4: Import revised translations. DO NOT MERGE

2010-08-04 10:59:25 -07:00

src/com/android/settings

merge from open-source master

2010-06-11 13:31:28 -07:00

Android.mk

auto import from //depot/cupcake/@135843

2009-03-03 19:32:34 -08:00

AndroidManifest.xml

merge from open-source master

2010-06-11 13:31:28 -07:00