am 7f950388: Reconcile with jb-release nakasi-factoryrom-release

* commit '7f9503883e36c6201ae1e19cc8442bb1edc5bc19':
tree: 6dcde99235ea3a7f61c7869df68456058b6e6368
  1. res/
  2. src/