am 14b961f6: Reconcile with jb-release

* commit '14b961f6ef4ab2177765c3e64676f0735d934158':
tree: a0fafb12089223303ef35c3b3387287699eaa9d0
  1. res/
  2. src/