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)
* 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


Trivial merge