tree f327758d07cdb58a8e4a06f236f82f8df9515992
parent a16bb6d9e4e47bc5d4f53ee44b90df0114f2883a
parent 34bbc7d49a4f0578798d039fc16369b1a6ea16bd
author Elliott Hughes <enh@google.com> 1428706987 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1428706987 +0000

am 34bbc7d4: am f19007a5: Merge "Auto-detect whether to use the long-press UI."

* commit '34bbc7d49a4f0578798d039fc16369b1a6ea16bd':
  Auto-detect whether to use the long-press UI.