am 6de8911d: (-s ours) am 6006439c: (-s ours) Import translations. DO NOT MERGE
authorBaligh Uddin <baligh@google.com>
Sun, 6 Jul 2014 22:03:59 +0000 (22:03 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Sun, 6 Jul 2014 22:03:59 +0000 (22:03 +0000)
commit33762c3ded9fdea6ea05fc3ab784a00879c11aa7
tree808e69349393bcdecb7ba067b5843c3fe28f5d4a
parentf92dcff03c9c766108b44668dcbfcabf7af0424e
parent6de8911d35a912f3f51900a59cf796da925f2609
am 6de8911d: (-s ours) am 6006439c: (-s ours) Import translations. DO NOT MERGE

* commit '6de8911d35a912f3f51900a59cf796da925f2609':
  Import translations. DO NOT MERGE