am fe1ade17: Reconcile with jb-release nakasi-factoryrom-release

* commit 'fe1ade179e5285178c691b5b397d59a8d927d0e4':
tree: e63a74a3b1e56744ea8dccc8b5e384e646b3aacd
  1. res/
  2. src/