tree cea401a50b9988d155259f0b11ad04d5d31ce7d5
parent e3b6ad7dfd453b7adbd7c4eb8d5fd3c1add2a4cc
parent 26d64699fa23ca6baca8af934dc9c7aec1270523
author Wei Huang <weih@google.com> 1340217707 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1340217707 -0700

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

* commit '254a6b42372179bcc9cf6166639325d11411be77':
  Fade in/out the undo bar.