Reconcile with jb-release

Change-Id: Ica9e5255d9ea862cb24ef52d69545881147a2a26
tree: 73c2982a608138decaaf47962bdacb2cc33c0ef7
  1. res/
  2. src/