| commit | 296459ffbb9600a14be24c2cc06284ac47ea84c4 | [log] [tgz] |
|---|---|---|
| author | Deepanshu Gupta <deepanshu@google.com> | Fri Jul 18 22:39:22 2014 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Fri Jul 18 22:39:22 2014 +0000 |
| tree | c45d39f8c7ee4d2c222aaa2ca0a19607fe4e936d | |
| parent | 5d6322a527c81fa261642582a508f39a617a206a [diff] | |
| parent | f498991062d86e4cbf1c9880346a7feb8c428912 [diff] |
am f4989910: am d32dd294: am b86675f1: am f2c5a9ee: (-s ours) am b9efa1e5: am 14a4e69c: 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 'f498991062d86e4cbf1c9880346a7feb8c428912': Fix style resolution for styles with '.' [DO NOT MERGE]