am d82363c1: Reconcile with jb-release

* commit 'd82363c19cbfea1d6505f2c21467df84d021d511':
tree: 9ff71d414f8115c5fe41d4b4f0307ff25f8efd71
  1. java/
  2. res/
  3. tests/
  4. Android.mk