6f27ab8bd4
Merge commit '9c70835896b6c078ac4c8b2e30cb6cfba70bb9d7' * commit '9c70835896b6c078ac4c8b2e30cb6cfba70bb9d7': Add an aapt option to allow string variations for different devices.