| commit | 08840806b8dbc6c81ec69f409e38ca07f64da528 | [log] [tgz] |
|---|---|---|
| author | Deepanshu Gupta <deepanshu@google.com> | Fri Jul 18 22:02:28 2014 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Fri Jul 18 22:02:28 2014 +0000 |
| tree | 97f25cdab7686fb73cbc041a74f1c8a03e35f234 | |
| parent | 8613f826289d627df07971f074a2852012fc98b7 [diff] | |
| parent | 7f98066dd1a2a05d53ba39108dd4d44430e89c71 [diff] |
am 7f98066d: 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 '7f98066dd1a2a05d53ba39108dd4d44430e89c71': Fix style resolution for styles with '.' [DO NOT MERGE]