| commit | cd92f6a73087ad6350a033661be5c7900c730324 | [log] [tgz] |
|---|---|---|
| author | Deepanshu Gupta <deepanshu@google.com> | Sat Jul 19 00:41:52 2014 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Sat Jul 19 00:41:52 2014 +0000 |
| tree | 82e35cb7ad3a9ae4ef5840ac56d2c7f03f2d71bd | |
| parent | 580c3d823b9badc9230e8039be69375652eee8ad [diff] | |
| parent | 5d6322a527c81fa261642582a508f39a617a206a [diff] |
am 5d6322a5: (-s ours) am ad3ccc74: 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 '5d6322a527c81fa261642582a508f39a617a206a': Fix style resolution for styles with '.' [DO NOT MERGE]