From: Ruben Brunk <rubenbrunk@google.com>
Date: Thu, 25 Oct 2012 22:16:04 +0000 (-0700)
Subject: am 1ff4d0fd: am 15aff7c3: Merge "Tagged strings in XML with translation info." 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~80^2~1^2~93
X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=dc87b334;p=android-x86%2Fpackages-apps-Camera2.git

am 1ff4d0fd: am 15aff7c3: Merge "Tagged strings in XML with translation info." into gb-ub-photos-arches

* commit '1ff4d0fd3d6ca600a92ca939aab34a3ff11dc414':
  Tagged strings in XML with translation info.
---

dc87b334fe834fab09c8a220500b9c1683561543