From: Baligh Uddin <baligh@google.com>
Date: Wed, 3 Apr 2013 21:58:38 +0000 (-0700)
Subject: am 7f1ca673: (-s ours) Merge "Import translations. DO NOT MERGE" into gb-ub-photos... 
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~8^2^2~255
X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=b7ef3e106c99dfe785ebfbb357dab6e9c381c944;p=android-x86%2Fpackages-apps-Camera2.git

am 7f1ca673: (-s ours) Merge "Import translations. DO NOT MERGE" into gb-ub-photos-bryce

* commit '7f1ca673ab787c916c07f35ad3a5c868eb700ada':
  Import translations. DO NOT MERGE
---

b7ef3e106c99dfe785ebfbb357dab6e9c381c944