From: Baligh Uddin <baligh@google.com>
Date: Sat, 1 Jun 2013 15:20:30 +0000 (-0700)
Subject: am 6d1345aa: (-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~11
X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=4f14938f803b017111cceb1df40332ad9bc2d261;p=android-x86%2Fpackages-apps-Camera2.git

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

* commit '6d1345aa496d9f5caedae6b3b0c5b6132fb01893':
  Import translations. DO NOT MERGE
---

4f14938f803b017111cceb1df40332ad9bc2d261