tree 543f6b0555668d450a49d862eee02beae2b932c3
parent e487e537b0fcc5b9f972c1e247fd1b019150fa05
parent 5b03460fcb69394b984fad1a63e244f9aa798886
author kmccormick@google.com <kmccormick@google.com> 1356122763 -0800
committer Android Git Automerger <android-git-automerger@android.com> 1356122763 -0800

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

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