| commit | 5d6322a527c81fa261642582a508f39a617a206a | [log] [tgz] |
|---|---|---|
| author | Deepanshu Gupta <deepanshu@google.com> | Fri Jul 18 22:17:36 2014 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Fri Jul 18 22:17:36 2014 +0000 |
| tree | c45d39f8c7ee4d2c222aaa2ca0a19607fe4e936d | |
| parent | 90824671b6467919e7aa12a09a6c21797764bca3 [diff] | |
| parent | ad3ccc741b867c4344e4c6c2338e02052244ae60 [diff] |
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 'ad3ccc741b867c4344e4c6c2338e02052244ae60': Fix style resolution for styles with '.' [DO NOT MERGE]