am 2f67e0e7: Merge "Fix issue 3317627." into honeycomb
am 2f67e0e7: Merge "Fix issue 3317627." into honeycomb

* commit '2f67e0e746e976960b5e11045c7b455307055558':
  Fix issue 3317627.

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