OSDN Git Service

am 86834682: am 4f5f71a1: (-s ours) am f5878b3e: am aa2ce5d9: (-s ours) DO NOT MERGE...
authorScott Main <smain@google.com>
Wed, 3 Oct 2012 04:06:00 +0000 (21:06 -0700)
committerAndroid Git Automerger <android-git-automerger@android.com>
Wed, 3 Oct 2012 04:06:00 +0000 (21:06 -0700)
* commit '868346827c5e1f5939c3669ee24c75da4489181e':
  DO NOT MERGE cherrypick from jb-dev Change-Id: I90412e1e03a2676d927796187fe811481bf38455 add localize langs for global strings


Trivial merge