Merge "Add camera icon for camera roll." into jb-dev
tree: b65b5ee4bafccb00795b9b19eba0e445c548ca51
  1. res/
  2. src/