am 4aa14f03: (-s ours) am b5071e4a: (-s ours) am 4802efe1: (-s ours) Import translati...
authorBaligh Uddin <baligh@google.com>
Thu, 16 Oct 2014 19:46:47 +0000 (19:46 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Thu, 16 Oct 2014 19:46:47 +0000 (19:46 +0000)
commitd247d86085cf4385e6de2822f55da88376ca165d
treef0dc34a411a6160bdb2fc7c0c5abc98e88bc2e47
parent337dba9e11f124214cc1f1d69bf26d9b32d5ca20
parente6feecb1837d84a5d529b1ac07c1a5167f8aac30
am 4aa14f03: (-s ours) am b5071e4a: (-s ours) am 4802efe1: (-s ours) Import translations. DO NOT MERGE
automerge: e6feecb  -s ours

* commit 'e6feecb1837d84a5d529b1ac07c1a5167f8aac30':
  Import translations. DO NOT MERGE