From: Baligh Uddin <baligh@google.com>
Date: Wed, 10 Apr 2013 20:04:00 +0000 (-0700)
Subject: am 35e29cb6: Merge "Import translations. DO NOT MERGE" into jb-mr2-dev
X-Git-Tag: android-x86-6.0-r3~68^2~28^2~213^2~19^2^2^2^2^2^2^2^2^2^2^2^2^2^2^2^2^2^2^2^2^2^2^2^2~428^2~2^2~13^2~231
X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=7e4e2521d142e99cfd9ee0b11b47a7014374fc93;p=android-x86%2Fpackages-apps-Camera2.git

am 35e29cb6: Merge "Import translations. DO NOT MERGE" into jb-mr2-dev

* commit '35e29cb6f248176682fd88b6a7bf8c99487551ff':
  Import translations. DO NOT MERGE
---

7e4e2521d142e99cfd9ee0b11b47a7014374fc93