From: Baligh Uddin <baligh@google.com>
Date: Tue, 24 Sep 2013 22:05:03 +0000 (-0700)
Subject: am e5d39a52: (-s ours) Merge "Import translations. DO NOT MERGE" into gb-ub-photos... 
X-Git-Tag: android-x86-6.0-r3~1684^2~44^2~112
X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=f1b81feb4352fe0eed297f9b2cfa3adec18d8718;p=android-x86%2Fpackages-apps-Camera2.git

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

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

f1b81feb4352fe0eed297f9b2cfa3adec18d8718