OSDN Git Service

am 2e68425e: (-s ours) am a167e65c: Import translations. DO NOT MERGE
authorEric Fischer <enf@google.com>
Fri, 10 Feb 2012 18:10:31 +0000 (10:10 -0800)
committerAndroid Git Automerger <android-git-automerger@android.com>
Fri, 10 Feb 2012 18:10:31 +0000 (10:10 -0800)
commita57e72eaf40ab153ec06c51716d42102de1b311f
tree74f88cb0e90082cd357f603b6025281e6b616ff7
parentf9d3df5a582328d90d2ba7cfd24f603b51c482c6
parent2e68425ec2364490dc77b91c8f06b672033e00db
am 2e68425e: (-s ours) am a167e65c: Import translations. DO NOT MERGE

* commit '2e68425ec2364490dc77b91c8f06b672033e00db':