tree c555dc7f1de5f26a98e09b6ec854ffd675a7de91
parent d223b7f02fcfe520d3f53eaec97f6cd08bd09296
parent 67ca0a789b0f9765990f90f4ff030ae08e44ac17
author Bart Sears <bsears@google.com> 1349940370 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1349940370 -0700

am 73c60cee: Merge "Hide unwanted scrollbars in editor" into gb-ub-photos-arches

* commit '73c60ceed9a8df0907cee52d804100f65771f3b6':
  Hide unwanted scrollbars in editor