am 06c2bf57: Reconcile with jb-release

* commit '06c2bf575b070bd47f0874155d9cfacba2538747':
tree: 26fcfd4e61005041cd6c879f1cb5d30e26b133a0
  1. java/
  2. res/
  3. tests/
  4. Android.mk