From: Baligh Uddin <baligh@google.com>
Date: Fri, 6 Sep 2013 04:43:47 +0000 (-0700)
Subject: am 7ca24118: (-s ours) am 01f12724: (-s ours) Merge "Import translations. DO NOT... 
X-Git-Tag: android-x86-6.0-r3~68^2~28^2~159^2~295
X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=5ea52719;p=android-x86%2Fpackages-apps-Camera2.git

am 7ca24118: (-s ours) am 01f12724: (-s ours) Merge "Import translations. DO NOT MERGE" into gb-ub-photos-carlsbad

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

5ea5271924aab88f789f3708b7a224bee31b4c17