tree 1f5580f469c652069cf01612b74b9d7cf9507ada
parent b5f93cd3c02592c0aa5a4814dc940aa7724f8636
parent b93cdae749c48a629331c9b039d3a0488752b82f
author Jason Sams <rjsams@android.com> 1250542926 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1250542926 -0700

am b93cdae7: Merge change 21570 into eclair

Merge commit 'b93cdae749c48a629331c9b039d3a0488752b82f'

* commit 'b93cdae749c48a629331c9b039d3a0488752b82f':
  Update fountain and add writable flag to script slots.