Merge change I18bde766 into eclair

* changes:
  Update PBAP to make compatiable with spec
tree: cb8e59ddb57a04ad1b612216f9ca0ca7ccbff30a
  1. res/
  2. src/
  3. Android.mk
  4. AndroidManifest.xml
  5. AndroidManifest_test.xml