OSDN Git Service

am 59d2a10f: (-s ours) am 66e52983: Import translations. DO NOT MERGE
authorEric Fischer <enf@google.com>
Tue, 15 May 2012 22:37:36 +0000 (15:37 -0700)
committerAndroid Git Automerger <android-git-automerger@android.com>
Tue, 15 May 2012 22:37:36 +0000 (15:37 -0700)
commit8bb62821015a6e8a4ab33a55695565fe9156204f
tree4071ae0ab8835d232cf78dfad57b5dd77df6c805
parentc46beb501f519fab926141902a5b8e49cdb7f62f
parent59d2a10fbe082fbeb82573af08fc6445dfd90469
am 59d2a10f: (-s ours) am 66e52983: Import translations. DO NOT MERGE

* commit '59d2a10fbe082fbeb82573af08fc6445dfd90469':
  Import translations. DO NOT MERGE