am ffa670b5: Bug 4167061
am ffa670b5: Bug 4167061

* commit 'ffa670b5b00b8b4c5a4296f9a1ac382c0e647894':
  Bug 4167061

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