| commit | 4ff3c7f0072d1c56d241b234e7f208009c86112f | [log] [tgz] |
|---|---|---|
| author | Deepanshu Gupta <deepanshu@google.com> | Fri Jul 18 22:07:47 2014 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Fri Jul 18 22:07:47 2014 +0000 |
| tree | c45d39f8c7ee4d2c222aaa2ca0a19607fe4e936d | |
| parent | 276ae4eee5450674fbc7e27f638f18ddc748b7f6 [diff] | |
| parent | 08840806b8dbc6c81ec69f409e38ca07f64da528 [diff] |
am 08840806: 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 '08840806b8dbc6c81ec69f409e38ca07f64da528': Fix style resolution for styles with '.' [DO NOT MERGE]