tree 0a69cd7b2adf3d3bf670e877beb366f7d0e390b4
parent bf33c35c3d12492806a3db9cb2230ef51abca411
parent 89f653b9ca0ceaf8185fd6ea69b808c5f6e81af5
author Eric Fischer <enf@google.com> 1317254587 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1317254587 -0700

am a94489b4: Merge "Don\'t lose product variant strings that also vary between locales." into ics-factoryrom

* commit 'a94489b4394350b1727437818cd4f6d845e97dc0':
  Don't lose product variant strings that also vary between locales.