OSDN Git Service

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


Trivial merge