tree 825e72bcf8cd6d4219d1463e175631d4a5f8a96d
parent fa28d45d59cd00163dad560eb3f9c1ed6d6651a0
parent 12f2f8dcd79fc1952b3d606829857b0df4398fa8
author kmccormick@google.com <kmccormick@google.com> 1356716848 -0800
committer Android Git Automerger <android-git-automerger@android.com> 1356716848 -0800

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

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