am 0c8f9ac7: am 490e81a7: Merge chips from jb-ub-mail-ur11 into klp-ub-dev

* commit '0c8f9ac7cb24ce655e660096332605138ec70542':
  Merge chips from jb-ub-mail-ur11 into klp-ub-dev
tree: ac7dfe1fa4e81b7c4a9e6f69dd64a38e592e9c66
  1. res/
  2. sample/
  3. src/
  4. tests/
  5. Android.mk
  6. AndroidManifest.xml
  7. project.properties