tree bf08d4b39df094d50b0b671297b2fb807f5f40f8
parent 76b245c24c12feec2381c423de2f7ffe4b78d7f0
parent 80c1a386d3f614919708b37986919ecaf74ee738
author Doug Zongker <dougz@google.com> 1395099194 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1395099194 +0000

am 80c1a386: resolved conflicts for merge of d90da130 to klp-modular-dev-plus-aosp

* commit '80c1a386d3f614919708b37986919ecaf74ee738':
  refactor image resource loading code in minui