OSDN Git Service

am 215ab980: am dc304a73: Merge "Import translations. DO NOT MERGE" into jb-mr1-locks...
authorBaligh Uddin <baligh@google.com>
Mon, 5 Nov 2012 23:59:36 +0000 (15:59 -0800)
committerAndroid Git Automerger <android-git-automerger@android.com>
Mon, 5 Nov 2012 23:59:36 +0000 (15:59 -0800)
* commit '215ab980e7f880e316cb405c6d79f5a383877217':
  Import translations. DO NOT MERGE


Trivial merge