am b0ef6ca4: am 358e6e3c: Merge change 22292 into eclair
am b0ef6ca4: am 358e6e3c: Merge change 22292 into eclair

Merge commit 'b0ef6ca47d6f8e24b6bbf0a605c2e42000929bc6'

* commit 'b0ef6ca47d6f8e24b6bbf0a605c2e42000929bc6':
  Adding a "Photo" directory under Contacts.

xorware/android_frameworks_base,xorware/android_frameworks_base,xorware/android_frameworks_base,xorware/android_frameworks_base,xorware/android_frameworks_base,xorware/android_frameworks_base