am ace6194f: am f4cca783: Merge change 23583 into eclair
am ace6194f: am f4cca783: Merge change 23583 into eclair

Merge commit 'ace6194fbfea7a7748face1f305ad6c643f8c41e'

* commit 'ace6194fbfea7a7748face1f305ad6c643f8c41e':
  Update fountain to use structures.

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