From: Baligh Uddin <baligh@google.com>
Date: Wed, 6 Mar 2013 16:58:06 +0000 (+0000)
Subject: am a6adeb67: (-s ours) am 6846c5d0: (-s ours) am 2962966e: am f831c736: (-s ours... 
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~499
X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=d3f31f5040596e8ef145e7371f56609df7f9d1d1;p=android-x86%2Fpackages-apps-Camera2.git

am a6adeb67: (-s ours) am 6846c5d0: (-s ours) am 2962966e: am f831c736: (-s ours) Merge "Import translations. DO NOT MERGE" into gb-ub-photos-bryce

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

d3f31f5040596e8ef145e7371f56609df7f9d1d1