am 118b5d79: Allow disabling page-flipping.

Merge commit '118b5d7961a4abc29c8bd592956007f40ad4fc6d' into gingerbread-plus-aosp

* commit '118b5d7961a4abc29c8bd592956007f40ad4fc6d':
  Allow disabling page-flipping.