| commit | 96c280aa1d6c5392effc1bc9ecb899f8e417b918 | [log] [tgz] |
|---|---|---|
| author | Deepanshu Gupta <deepanshu@google.com> | Sat Jul 19 00:41:43 2014 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Sat Jul 19 00:41:43 2014 +0000 |
| tree | 82e35cb7ad3a9ae4ef5840ac56d2c7f03f2d71bd | |
| parent | 1386fc647b0c46f10334c4c78f03e106affc7156 [diff] | |
| parent | 4ff3c7f0072d1c56d241b234e7f208009c86112f [diff] |
am 4ff3c7f0: (-s ours) 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 '4ff3c7f0072d1c56d241b234e7f208009c86112f': Fix style resolution for styles with '.' [DO NOT MERGE]