tree c4377c747fc45b0660ace355f1f77dc32c333ac7
parent 589622a47da216ab2b31e94011ae9985e4029891
parent f5878b3ea31a04d13888f14bd652340da8a38437
author Scott Main <smain@google.com> 1349236981 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1349236981 -0700

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

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