am b1fa549a: Merge "Fixes Issue 7907 in the public bugs database (http://code.google.com/p/android/issues/detail?id=7907)."
am b1fa549a: Merge "Fixes Issue 7907 in the public bugs database (http://code.google.com/p/android/issues/detail?id=7907)."

* commit 'b1fa549a49fd8fa2fe67ee30d107cc2d1486645f':
  Fixes Issue 7907 in the public bugs database (http://code.google.com/p/android/issues/detail?id=7907).

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