From: Scott Main <smain@google.com>
Date: Wed, 3 Oct 2012 04:06:00 +0000 (-0700)
Subject: am 86834682: am 4f5f71a1: (-s ours) am f5878b3e: am aa2ce5d9: (-s ours) DO NOT MERGE... 
X-Git-Tag: android-x86-4.4-r1~456^2^2~96
X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=155a16aba065f115cae3d4f65e2a42dfcd3b6672;p=android-x86%2Fbuild.git

am 86834682: am 4f5f71a1: (-s ours) am f5878b3e: am aa2ce5d9: (-s ours) DO NOT MERGE cherrypick from jb-dev Change-Id: I90412e1e03a2676d927796187fe811481bf38455 add localize langs for global strings

* commit '868346827c5e1f5939c3669ee24c75da4489181e':
  DO NOT MERGE cherrypick from jb-dev Change-Id: I90412e1e03a2676d927796187fe811481bf38455 add localize langs for global strings
---

155a16aba065f115cae3d4f65e2a42dfcd3b6672