am 4d513f54: Reconcile with jb-release nakasi-factoryrom-release

* commit '4d513f547c5046546ee440485fd5f4ec484f84e0':
tree: e2af7aface20b033ee71210f4bfdfec6cd1dd674
  1. java/
  2. res/
  3. tests/
  4. Android.mk