am a1e273ae: Merge "Surface: fix a protected buffer test" into ics-mr0
am a1e273ae: Merge "Surface: fix a protected buffer test" into ics-mr0

* commit 'a1e273ae590ee08cf27baca7facfce51e598d995':
  Surface: fix a protected buffer test

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