| commit | 7f98066dd1a2a05d53ba39108dd4d44430e89c71 | [log] [tgz] |
|---|---|---|
| author | Deepanshu Gupta <deepanshu@google.com> | Fri Jul 18 21:57:44 2014 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Fri Jul 18 21:57:44 2014 +0000 |
| tree | c432967584d08d3c09ec0427f572f92a38fb8672 | |
| parent | efd29681d8f8df6d23a1e7f307e9300bd8331a2f [diff] | |
| parent | 4c312f20cafc3160e04224f18cacd8d35a7f9e3c [diff] |
am 4c312f20: am a3d2c7e7: (-s ours) am 85c7b209: am 5efee91e: Merge "Fix style resolution for styles with \'.\' [DO NOT MERGE]" into jb-mr2-dev * commit '4c312f20cafc3160e04224f18cacd8d35a7f9e3c': Fix style resolution for styles with '.' [DO NOT MERGE]