OSDN Git Service

am 341ff2b0: am f994f353: (-s ours) am 448249d1: (-s ours) am 744c5b0b: Merge "Import...
authorJustin Ho <justinho@google.com>
Fri, 10 Feb 2012 18:22:40 +0000 (10:22 -0800)
committerAndroid Git Automerger <android-git-automerger@android.com>
Fri, 10 Feb 2012 18:22:40 +0000 (10:22 -0800)
commit02ddf51edb1339a054981684d92d6690e3b350b6
treecc601c2c420c5235b4e1526d29509c568f4eb13e
parent08ba5eb67002913267bd539e20f1dcfb0e28642d
parent5414a714b1624774484882e08edd59a3b25ec30c
am 341ff2b0: am f994f353: (-s ours) am 448249d1: (-s ours) am 744c5b0b: Merge "Import translations. DO NOT MERGE" into ics-mr1

* commit '341ff2b08380fcab0f2313fb4feca732cf70f840':
  Import translations. DO NOT MERGE