| commit | ad3ccc741b867c4344e4c6c2338e02052244ae60 | [log] [tgz] |
|---|---|---|
| author | Deepanshu Gupta <deepanshu@google.com> | Fri Jul 18 22:12:10 2014 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Fri Jul 18 22:12:10 2014 +0000 |
| tree | 97f25cdab7686fb73cbc041a74f1c8a03e35f234 | |
| parent | 98b243660c56129a0e2962e2faeeef1b65409210 [diff] | |
| parent | 3f51ab0d81b3f24a0246f3bfe28ea5b364b48210 [diff] |
am 3f51ab0d: am 3c92b932: am 62b81acb: (-s ours) am 2df48bed: am 1bdfeadb: am 610341b3: (-s ours) am 95bbeb96: am b8e4e8e1: am d3ac01ff: Merge "Fix style resolution for styles with \'.\' [DO NOT MERGE]" into jb-mr1.1-dev * commit '3f51ab0d81b3f24a0246f3bfe28ea5b364b48210': Fix style resolution for styles with '.' [DO NOT MERGE]