| commit | 0dfccbc9111e6bca93bec9b06f9fb91be8d8c654 | [log] [tgz] |
|---|---|---|
| author | Deepanshu Gupta <deepanshu@google.com> | Sat Jul 19 00:41:35 2014 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Sat Jul 19 00:41:35 2014 +0000 |
| tree | 82e35cb7ad3a9ae4ef5840ac56d2c7f03f2d71bd | |
| parent | e4e37ed5cc8f1f7bef79d5e08dbbb62e08c31b19 [diff] | |
| parent | 0804e0aded17c1aee8cbd2c34247b390051123c3 [diff] |
am 0804e0ad: (-s ours) am a9e488a6: am d8d3e87c: am 4627c98d: Merge "Fix style resolution for styles with \'.\' [DO NOT MERGE]" into klp-dev * commit '0804e0aded17c1aee8cbd2c34247b390051123c3': Fix style resolution for styles with '.' [DO NOT MERGE]