am c7351974: (-s ours) am a3966c66: am 62743940: am 8c71ff29: am 87234e85: am 9c48ab82: am ccf7b2aa: am 5af7324a: Fix style resolution for styles with \'.\' [DO NOT MERGE]
* commit 'c735197420948ffff757dbe6d00028a87ed09c15': Fix style resolution for styles with '.' [DO NOT MERGE]
This commit is contained in: