OSDN Git Service

am b0d203c3: (-s ours) am 4bec429d: Import translations. DO NOT MERGE
authorEric Fischer <enf@google.com>
Mon, 6 Feb 2012 20:52:29 +0000 (12:52 -0800)
committerAndroid Git Automerger <android-git-automerger@android.com>
Mon, 6 Feb 2012 20:52:29 +0000 (12:52 -0800)
commitcf0a7630c5aa2f8715133f8d0cbfca1a334077d0
treea1bb74870baf326b595abde7baae8beb67d1a086
parent4fe2427034f95016b6fd18286e24076e668cea8f
parentb0d203c395ddc16860241381032a5c8b8e870e60
am b0d203c3: (-s ours) am 4bec429d: Import translations. DO NOT MERGE

* commit 'b0d203c395ddc16860241381032a5c8b8e870e60':
  Import translations. DO NOT MERGE