OSDN Git Service

am 8f6e1dc3: am d7899c56: Fix undo/redo/back button behaviour with effects and enable...
authornicolasroard <nicolasroard@google.com>
Fri, 19 Oct 2012 00:13:27 +0000 (17:13 -0700)
committerAndroid Git Automerger <android-git-automerger@android.com>
Fri, 19 Oct 2012 00:13:27 +0000 (17:13 -0700)
* commit '8f6e1dc361d57e8cabb6dcce3d06edaa1c25f21c':
  Fix undo/redo/back button behaviour with effects and enable history


Trivial merge