am 10a2979e: Merge "Fix bug #7249363 Icons in the Camera UI (to switch camera types and on the focus ring) are missing" into jb-mr1-dev
am 10a2979e: Merge "Fix bug #7249363 Icons in the Camera UI (to switch camera types and on the focus ring) are missing" into jb-mr1-dev

* commit '10a2979e551243f337e4ae1a2951c282546c7433':
  Fix bug #7249363 Icons in the Camera UI (to switch camera types and on the focus ring) are missing

xorware/android_frameworks_base,xorware/android_frameworks_base,xorware/android_frameworks_base,xorware/android_frameworks_base,xorware/android_frameworks_base,xorware/android_frameworks_base