OSDN Git Service

am 84c90053: (-s ours) am fcb089c9: Merge "Reimport Settings translations. DO NOT...
authorEric Fischer <enf@google.com>
Mon, 11 Apr 2011 21:24:30 +0000 (14:24 -0700)
committerAndroid Git Automerger <android-git-automerger@android.com>
Mon, 11 Apr 2011 21:24:30 +0000 (14:24 -0700)
commit2439b7c00d86fb490b48e2bc0927fd581bf59e0e
tree8a72c1601da9244c72a8552d072997f75918aa5c
parent719e1e43173155cbe0d77298c3d1ca05f143048b
parent84c90053751ae1bcb07a845f5ac9747a808198b1
am 84c90053: (-s ours) am fcb089c9: Merge "Reimport Settings translations.  DO NOT MERGE" into gingerbread

* commit '84c90053751ae1bcb07a845f5ac9747a808198b1':
  Reimport Settings translations.  DO NOT MERGE