tree c635317752984c1f64ef9d2441dff7fb122d8748
parent 3564d9eada7ae3f40bc4c80272fbbb867f04e018
parent debb5bbe816ce764ecda73eabc17c31fd59fbe3e
author Michael Kolb <kolby@google.com> 1295650170 -0800
committer Android Git Automerger <android-git-automerger@android.com> 1295650170 -0800

am debb5bbe: Merge "Add public API for on screen zoom controls" into honeycomb

* commit 'debb5bbe816ce764ecda73eabc17c31fd59fbe3e':
  Add public API for on screen zoom controls