OSDN Git Service

am c2bc46ea: (-s ours) am 4e1e57fd: am a64072a4: Merge "Import translations. DO NOT...
authorJustin Ho <justinho@google.com>
Fri, 10 Feb 2012 18:15:37 +0000 (10:15 -0800)
committerAndroid Git Automerger <android-git-automerger@android.com>
Fri, 10 Feb 2012 18:15:37 +0000 (10:15 -0800)
commitb09b9bd0af11a5985c8854e9161c8e0a9637486f
tree574be6c3e7b532fe3453d186ffb8f228801d134d
parentc2661be5d5531cc70cf3f4c9387b4ac0cde5f0e5
parentc2bc46ea31e7ec145f11ba7a7d5f5891ad0c50ac
am c2bc46ea: (-s ours) am 4e1e57fd: am a64072a4: Merge "Import translations. DO NOT MERGE" into ics-mr1

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