tree cac5de6310fb9b1433123dd0f3d4aa5d42513560
parent f058c3e790e5d5d811a925808111abf4671f439e
parent 822200267879dfaaf77421007116e59c5bb372cd
author Wei Huang <weih@google.com> 1340217514 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1340217514 -0700

am 82220026: Merge "Fade in/out the undo bar." into jb-dev

* commit '822200267879dfaaf77421007116e59c5bb372cd':
  Fade in/out the undo bar.