am 757c85e4: (-s ours) am c065fc55: (-s ours) Disable sending Photo field for PBAP. Do Not Merge.

Merge commit '757c85e4ce37336dbd549718fbf09a1b36ae4da5'

* commit '757c85e4ce37336dbd549718fbf09a1b36ae4da5':
  Disable sending Photo field for PBAP. Do Not Merge.
tree: 5ce0a59140f93890b9c981a5add3b224c2f54735
  1. res/
  2. src/
  3. Android.mk
  4. AndroidManifest.xml
  5. AndroidManifest_test.xml