am 9334cdf3: Reconcile with jb-release

* commit '9334cdf3825667134a55b198568c76ae40fc4a57':
tree: 7463c99f8252c6b27841811a903e07345d1ecdfe
  1. res/
  2. src/