| commit | a68c517c628acdcfd0107536f34c3fd882ce0629 | [log] [tgz] |
|---|---|---|
| author | Doug Zongker <dougz@google.com> | Mon Mar 17 23:33:14 2014 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Mon Mar 17 23:33:14 2014 +0000 |
| tree | bf08d4b39df094d50b0b671297b2fb807f5f40f8 | |
| parent | 76b245c24c12feec2381c423de2f7ffe4b78d7f0 [diff] | |
| parent | 80c1a386d3f614919708b37986919ecaf74ee738 [diff] |
am 80c1a386: resolved conflicts for merge of d90da130 to klp-modular-dev-plus-aosp * commit '80c1a386d3f614919708b37986919ecaf74ee738': refactor image resource loading code in minui