am 273fe6a3: am 4a02e071: am 788fb96d: am 47653f2d: Merge "Move options buffers to top scope"
am 273fe6a3: am 4a02e071: am 788fb96d: am 47653f2d: Merge "Move options buffers to top scope"

* commit '273fe6a327de8051ac075855ceb7b33a9422c7a7':
  Move options buffers to top scope

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