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