commit | f2c5a9ee4944b5ca995d0c6b11ccaddecf6432e1 | [log] [tgz] |
---|---|---|
author | Deepanshu Gupta <deepanshu@google.com> | Fri Jul 18 22:22:24 2014 +0000 |
committer | Android Git Automerger <android-git-automerger@android.com> | Fri Jul 18 22:22:24 2014 +0000 |
tree | 8b167a40c85d9c097783d1447b85f76ded4684a4 | |
parent | 62b81acbcad6ceaa269c7f788068bdf32f403040 [diff] | |
parent | b9efa1e5a11d1542d0bab9c945ce1e920b819764 [diff] |
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 'b9efa1e5a11d1542d0bab9c945ce1e920b819764': Fix style resolution for styles with '.' [DO NOT MERGE]