am 88235a5e: am 672ea584: Merge "fix [2420565] Surface.lockCanvas() updates the dirty region too often" into kraken
am 88235a5e: am 672ea584: Merge "fix [2420565] Surface.lockCanvas() updates the dirty region too often" into kraken

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