Reconcile with jb-release

Change-Id: Ib078ec6a8d678533d89d2db0d1d8df2fa6c724e8
tree: e9a1bacb8a85606851e658ca15b9d1ac35dfc41c
  1. res/
  2. src/