am be978ed4: (-s ours) Import translations. DO NOT MERGE
authorGeoff Mendal <mendal@google.com>
Thu, 14 May 2015 10:06:26 +0000 (10:06 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Thu, 14 May 2015 10:06:26 +0000 (10:06 +0000)
commit129bed0ef17fc59524791bea5057d43fe05168ba
tree546ae3c1a27574be4f0525d25cf4e65b30e0e3e9
parenta09378b08f12c6c331f5eac65120f406e11dcaad
parentbe978ed48a0792d7784cef6d1bd5bc83dbae695a
am be978ed4: (-s ours) Import translations. DO NOT MERGE

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