| commit | 14a4e69cc656b60c705d2f05229aed2a7049693c | [log] [tgz] |
|---|---|---|
| author | Deepanshu Gupta <deepanshu@google.com> | Fri Jul 18 22:12:02 2014 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Fri Jul 18 22:12:02 2014 +0000 |
| tree | f412aeeba288432af93271a563ca0df24de3f800 | |
| parent | 1bdfeadb61343a5331fcfda06b40a0e3042a2ae6 [diff] | |
| parent | c735197420948ffff757dbe6d00028a87ed09c15 [diff] |
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]