tree e12a36f642b9b184c3dc97bafba02e1e2d089eff
parent f6c71644dce2a93c386a1803a46ca7d99a9ae543
parent ec6d08475ee1a2020556b43b4698b60dcb56a9c6
author kmccormick@google.com <kmccormick@google.com> 1356123062 -0800
committer Android Git Automerger <android-git-automerger@android.com> 1356123062 -0800

am ec6d0847: am 5b03460f: Merge "cherrypick from jb-dev-docs: Gestures Class Change-Id: I9abebf58a9607c8f52f72ef2ce46308304386596" into jb-mr1-dev

* commit 'ec6d08475ee1a2020556b43b4698b60dcb56a9c6':
  cherrypick from jb-dev-docs: Gestures Class Change-Id: I9abebf58a9607c8f52f72ef2ce46308304386596