Merge changes I000b9684,I1a6a0f46 into devel/master
authorKimmo Hoikka <kimmo.hoikka@samsung.com>
Tue, 5 Jan 2016 18:33:19 +0000 (10:33 -0800)
committerGerrit Code Review <gerrit@review.vlan103.tizen.org>
Tue, 5 Jan 2016 18:33:19 +0000 (10:33 -0800)
commita5fd3c7972dade609f0a66a3c4fca27d33ee7454
tree93cedaf040aa9abe525aa64969fa83d63daf94ea
parentb82f0397d674ec5a02f79c6e86ce01d2aa8f5f7f
parent403ee2c915ca37f3b768bc1567229393adf1f7ed
Merge changes I000b9684,I1a6a0f46 into devel/master

* changes:
  (ImageView) Reinstated RESOURCE_URL property for source compatibility with release
  Restored control-depth-index-ranges.h to released version but using devel values internally