| commit | f82046b23367e844b43318d9cb73200750a042a5 | [log] [tgz] |
|---|---|---|
| author | Deepanshu Gupta <deepanshu@google.com> | Wed Oct 29 22:53:34 2014 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Wed Oct 29 22:53:34 2014 +0000 |
| tree | 1f05a4211634632f40eff10934677f24c4fa092f | |
| parent | c5afeb2cbbbf762013306397507fa2059d3aaf13 [diff] | |
| parent | 122ccfb08fdde43793159d17d263271a0d311a1f [diff] |
am 122ccfb0: am 916d7796: am c55eb170: Merge "Fix multiple styles case in resource resolution." into lmp-dev * commit '122ccfb08fdde43793159d17d263271a0d311a1f': Fix multiple styles case in resource resolution.