am 5456310c: am ee4f9461: am 9182d368: Fix build error

* commit '5456310ccd30235c5ea7298996c69ac54edbb1ec':
  Fix build error
tree: 06e98157167a10b33096083f6c04606df7f11418
  1. res/
  2. src/
  3. Android.mk
  4. AndroidManifest.xml