am e167e1cf: Reconcile with jb-release

* commit 'e167e1cf7f23f3605523c6c6808a1a39eecc74ef':
tree: e19cb1f6517f005efc88cbeea4c111c79cd12e6b
  1. res/
  2. src/