| commit | d32dd2948d95a01e6b581ffbc357cf759bae0242 | [log] [tgz] |
|---|---|---|
| author | Deepanshu Gupta <deepanshu@google.com> | Fri Jul 18 22:31:17 2014 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Fri Jul 18 22:31:17 2014 +0000 |
| tree | c432967584d08d3c09ec0427f572f92a38fb8672 | |
| parent | 3f51ab0d81b3f24a0246f3bfe28ea5b364b48210 [diff] | |
| parent | b86675f14bea0c833f0ac3f0ec4d3e5f46784569 [diff] |
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 'b86675f14bea0c833f0ac3f0ec4d3e5f46784569': Fix style resolution for styles with '.' [DO NOT MERGE]