tree c1733219a0653c63256bac16387d7166f723926d
parent 8eef658cf9ff1d06fa6b94aecff62b5f6bf66777
parent 8a901a6133308d8cc15dfbad1e96f1aa09028b9b
author Baligh Uddin <baligh@google.com> 1445301287 +0000
committer android-build-merger <android-build-merger@google.com> 1445301287 +0000

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

* commit '8a901a6133308d8cc15dfbad1e96f1aa09028b9b':
  Import translations. DO NOT MERGE