| commit | 1bdfeadb61343a5331fcfda06b40a0e3042a2ae6 | [log] [tgz] |
|---|---|---|
| author | Deepanshu Gupta <deepanshu@google.com> | Fri Jul 18 21:49:11 2014 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Fri Jul 18 21:49:11 2014 +0000 |
| tree | f412aeeba288432af93271a563ca0df24de3f800 | |
| parent | e83fa180a874fb9222ae8e87c0d333411decc0c7 [diff] | |
| parent | 610341b3eb99ef2f070c96d60ca30c28283f1dea [diff] |
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 '610341b3eb99ef2f070c96d60ca30c28283f1dea': Fix style resolution for styles with '.' [DO NOT MERGE]