From: Baligh Uddin <baligh@google.com>
Date: Fri, 12 Apr 2013 23:42:18 +0000 (-0700)
Subject: am ced505a6: am b9db2d6a: (-s ours) Merge "Import translations. DO NOT MERGE" into... 
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~213
X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=504fa93286d4bf2cab1fa99d0c46f704d952808f;p=android-x86%2Fpackages-apps-Camera2.git

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

* commit 'ced505a6a7364b8623849354aa3f3134bad35830':
  Import translations. DO NOT MERGE
---

504fa93286d4bf2cab1fa99d0c46f704d952808f