am 57150b3c: Reconcile with jb-release

* commit '57150b3c30a066bdf7f346223bf0707a345c4e47':
tree: 73c2982a608138decaaf47962bdacb2cc33c0ef7
  1. res/
  2. src/