merge in nakasi-factoryrom-release history after reset to jb-dev
tree: fea154ebdd7b9185c7c1089bac937bd9bb381b76
  1. res/
  2. src/