tree 5babd8338e5cd14b2492ab6013943919e004ae43
parent 8df59affc67b0b9d0932ba6a924bc8397df37782
parent 0b9aa50d2b36c68d92abcdddd8ae529911053c46
author Baligh Uddin <baligh@google.com> 1413527643 +0000
committer android-build-merger <android-build-merger@google.com> 1413527643 +0000

am 3d1d7a77: (-s ours) am 66838ce1: (-s ours) am cc665090: (-s ours) Import translations. DO NOT MERGE
automerge: 0b9aa50  -s ours

* commit '0b9aa50d2b36c68d92abcdddd8ae529911053c46':
  Import translations. DO NOT MERGE