OSDN Git Service

am ce4bce00: am 201a77ea: (-s ours) am 940f2a74: (-s ours) am 67a50f99: Import transl...
authorEric Fischer <enf@google.com>
Thu, 2 Feb 2012 21:54:27 +0000 (13:54 -0800)
committerAndroid Git Automerger <android-git-automerger@android.com>
Thu, 2 Feb 2012 21:54:27 +0000 (13:54 -0800)
commit160dc0f298c870c701e663491c01ba8ed6bc7c4b
treeb78633fd54ee27cb2126a154df463c29439663a9
parent8a7a645ff7d7f99d6a8721af2ffc09e151abf8ba
parentce4bce00eb0ef282ebea715dc7cdc7fafce3f84b
am ce4bce00: am 201a77ea: (-s ours) am 940f2a74: (-s ours) am 67a50f99: Import translations. DO NOT MERGE

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