9c70835896
Merge commit '37cedce14bc0e68e8bf27c2cecb181728226e6ed' into gingerbread-plus-aosp * commit '37cedce14bc0e68e8bf27c2cecb181728226e6ed': Add an aapt option to allow string variations for different devices.