tree 63d8f7a8ceb0bb2f8800474045d5de3b080b24eb
parent aba68a3dbf190698bee81df4e8b28907aa93d517
parent 6b3f51d373f19711a7fac44f2f6df9dc89110eb1
author Romain Guy <romainguy@android.com> 1247821730 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1247821730 -0700

am 6b3f51d3: More new gestures UI. Adds a back button at the bottom of the settings activity.

Merge commit '6b3f51d373f19711a7fac44f2f6df9dc89110eb1'

* commit '6b3f51d373f19711a7fac44f2f6df9dc89110eb1':
  More new gestures UI. Adds a back button at the bottom of the settings activity.