OSDN Git Service

am a5520e76: (-s ours) Reconcile with jb-mr2-release - do not merge
authorThe Android Open Source Project <initial-contribution@android.com>
Thu, 13 Jun 2013 01:10:13 +0000 (18:10 -0700)
committerAndroid Git Automerger <android-git-automerger@android.com>
Thu, 13 Jun 2013 01:10:13 +0000 (18:10 -0700)
commitff8fbf095665cf10922957d90317bc6319bbc3dd
treeb95a2c4beb6ab3a8660af77933357c0c75c82637
parentbdd91eab5940515cb3a99b0c10b2d9863c249e4f
parenta5520e76911421956c7c4fe4e28ac60c64a276b9
am a5520e76: (-s ours) Reconcile with jb-mr2-release - do not merge

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