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