From: Baligh Uddin <baligh@google.com>
Date: Tue, 13 May 2014 15:58:01 +0000 (+0000)
Subject: am 14e881aa: (-s ours) Merge "Import translations. DO NOT MERGE" into ub-camera-everg... 
X-Git-Tag: android-x86-6.0-r3~1007
X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=a2faa7715ee7da251c06ea2263ce0d712a0aff36;p=android-x86%2Fpackages-apps-Camera2.git

am 14e881aa: (-s ours) Merge "Import translations. DO NOT MERGE" into ub-camera-everglades

* commit '14e881aa7e7b741342c0afea4c07eba29270b73f':
  Import translations. DO NOT MERGE
---

a2faa7715ee7da251c06ea2263ce0d712a0aff36