am abd8c8ac: am f075b4e7: Fix fountain crash.
am abd8c8ac: am f075b4e7: Fix fountain crash.

Merge commit 'abd8c8ac937e78733390142e73352c8397cfb00a'

* commit 'abd8c8ac937e78733390142e73352c8397cfb00a':
  Fix fountain crash.

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