| commit | 122ccfb08fdde43793159d17d263271a0d311a1f | [log] [tgz] |
|---|---|---|
| author | Deepanshu Gupta <deepanshu@google.com> | Wed Oct 29 18:51:28 2014 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Wed Oct 29 18:51:28 2014 +0000 |
| tree | aa862f70402b45443f92d412380fd0cedc8218b8 | |
| parent | 62cf56cf99204bc3912119e8bed06e43f7ba6da9 [diff] | |
| parent | 916d779650352059b08b7257f71a7aab8b333eba [diff] |
am 916d7796: am c55eb170: Merge "Fix multiple styles case in resource resolution." into lmp-dev * commit '916d779650352059b08b7257f71a7aab8b333eba': Fix multiple styles case in resource resolution.