tree aa7f567d65a36a8581e819ef8e3e54b82f0f77e5
parent c6d11993ee961beda73fcecb682333590e34b174
parent 1dfe52103f04675e0d7ee6b5e2a515cb6732403d
author Baligh Uddin <baligh@google.com> 1414775779 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1414775779 +0000

am 1dfe5210: (-s ours) am 1baffe78: (-s ours) Merge "Import translations. DO NOT MERGE" into stage-aosp-master

* commit '1dfe52103f04675e0d7ee6b5e2a515cb6732403d':
  Import translations. DO NOT MERGE