| commit | b9efa1e5a11d1542d0bab9c945ce1e920b819764 | [log] [tgz] |
|---|---|---|
| author | Deepanshu Gupta <deepanshu@google.com> | Fri Jul 18 22:17:00 2014 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Fri Jul 18 22:17:00 2014 +0000 |
| tree | 94a2581b178728611004f124759d879a6fa95ae7 | |
| parent | 2df48bed6afed4958835b8bdc2c8b44db32919fc [diff] | |
| parent | 14a4e69cc656b60c705d2f05229aed2a7049693c [diff] |
am 14a4e69c: am c7351974: (-s ours) am a3966c66: am 62743940: am 8c71ff29: am 87234e85: am 9c48ab82: am ccf7b2aa: am 5af7324a: Fix style resolution for styles with \'.\' [DO NOT MERGE] * commit '14a4e69cc656b60c705d2f05229aed2a7049693c': Fix style resolution for styles with '.' [DO NOT MERGE]