tree cd0176513e772aa141a9fd4ebc85fe632dcb3a9d
parent a72da3aec6419a3ae5edaec91f1d07f63f0bce7a
parent 273fe6a327de8051ac075855ceb7b33a9422c7a7
author Dave Allison <dallison@google.com> 1394832951 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1394832951 +0000

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

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