am 9c708358: am 37cedce1: Merge "Add an aapt option to allow string variations...
am 9c708358: am 37cedce1: Merge "Add an aapt option to allow string variations for different devices." into gingerbread
Merge commit '9c708358'
* commit '9c708358':
Add an aapt option to allow string variations for different devices.