| commit | 916d779650352059b08b7257f71a7aab8b333eba | [log] [tgz] |
|---|---|---|
| author | Deepanshu Gupta <deepanshu@google.com> | Wed Oct 29 00:15:56 2014 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Wed Oct 29 00:15:56 2014 +0000 |
| tree | c814d244e519dba249209ca20214d176b60fc60f | |
| parent | 6fb2fda85c410e23a1b9366c025fe288447bf027 [diff] | |
| parent | c55eb170cccea10158cedaeccd991b4b97d0036c [diff] |
am c55eb170: Merge "Fix multiple styles case in resource resolution." into lmp-dev * commit 'c55eb170cccea10158cedaeccd991b4b97d0036c': Fix multiple styles case in resource resolution.