OSDN Git Service

am f9d3df5a: (-s ours) am 87712d44: am a167e65c: Import translations. DO NOT MERGE
authorEric Fischer <enf@google.com>
Fri, 10 Feb 2012 18:15:27 +0000 (10:15 -0800)
committerAndroid Git Automerger <android-git-automerger@android.com>
Fri, 10 Feb 2012 18:15:27 +0000 (10:15 -0800)
* commit 'f9d3df5a582328d90d2ba7cfd24f603b51c482c6':
  Import translations. DO NOT MERGE


Trivial merge