tree e3ab6c1096cc81e2ebc5d4d11bc3599c322e6132
parent db58f9692a2e9b5d13e5fbb37373d4789b409f48
parent 1c50ba0372cfcdbff38aaed29ec9b8e4b1b29143
author Baligh Uddin <baligh@google.com> 1446753735 +0000
committer android-build-merger <android-build-merger@google.com> 1446753735 +0000

Merge "Import translations. DO NOT MERGE" into stage-aosp-master am: cfd3d76b91  -s ours
am: 1c50ba0372  -s ours

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