| commit | 85c7b209c3babea164f5bec13352e7f5f262ea58 | [log] [tgz] |
|---|---|---|
| author | Deepanshu Gupta <deepanshu@google.com> | Fri Jul 18 21:39:25 2014 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Fri Jul 18 21:39:25 2014 +0000 |
| tree | 94a2581b178728611004f124759d879a6fa95ae7 | |
| parent | 918ca12ffc09a96194112edf3540d94c32918a07 [diff] | |
| parent | 5efee91e12420e59214946c526f80961738a9c1d [diff] |
am 5efee91e: Merge "Fix style resolution for styles with \'.\' [DO NOT MERGE]" into jb-mr2-dev * commit '5efee91e12420e59214946c526f80961738a9c1d': Fix style resolution for styles with '.' [DO NOT MERGE]