tree cb5ef391b48c332e7a4b893686fc2f0f59fac02f
parent 745e360103e81facb6641d035c5e3ccc8ace855e
parent a6708c6a462d2a30e51e7ded2559a4054cb651fc
author Mangesh Ghiware <mghiware@google.com> 1318522760 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1318522760 -0700

am a6708c6a: Merge "Add setting for configuring zoom level on double-tap." into ics-mr0

* commit 'a6708c6a462d2a30e51e7ded2559a4054cb651fc':
  Add setting for configuring zoom level on double-tap.