DO NOT MERGE
DO NOT MERGE

Bring back +/- when panning. Dismiss it when pinching.


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