OSDN Git Service

am 8f526423: (-s ours) am b3dc6118: Merge "Import translations. DO NOT MERGE" into...
authorEric Fischer <enf@google.com>
Thu, 3 May 2012 22:02:34 +0000 (15:02 -0700)
committerAndroid Git Automerger <android-git-automerger@android.com>
Thu, 3 May 2012 22:02:34 +0000 (15:02 -0700)
* commit '8f526423ad187254bbb5dc93c6d5499bc4bba72b':
  Import translations. DO NOT MERGE


Trivial merge