tree cba62d0d64153aa2169651696bc238591341d679
parent 431d174f26eb82acdae1b045da7be921be12c93c
parent 35424cc2a6643609f82349c6903e1ee7c2d073dc
author Baligh Uddin <baligh@google.com> 1445301002 +0000
committer android-build-merger <android-build-merger@google.com> 1445301002 +0000

am 869df29e: (-s ours) am c1ac011a: (-s ours) Import translations. DO NOT MERGE
am: 35424cc2a6  -s ours

* commit '35424cc2a6643609f82349c6903e1ee7c2d073dc':
  Import translations. DO NOT MERGE