OSDN Git Service

am 6870d401: (-s ours) am d570731b: Import translations. DO NOT MERGE
authorEric Fischer <enf@google.com>
Wed, 2 May 2012 19:22:38 +0000 (12:22 -0700)
committerAndroid Git Automerger <android-git-automerger@android.com>
Wed, 2 May 2012 19:22:38 +0000 (12:22 -0700)
commitfe7a6e3dfd7126207bd5fe792e66d9fcb1fd30e3
tree2f7e3acdb0bdf90c6a40075f57f5d9e1a42265e8
parentb1bedd6150c2428f5cdc2bb39158b8cb42a64512
parent6870d401f34adc29c6f84a70b26689138ede2896
am 6870d401: (-s ours) am d570731b: Import translations. DO NOT MERGE

* commit '6870d401f34adc29c6f84a70b26689138ede2896':
  Import translations. DO NOT MERGE