OSDN Git Service

am 04d95221: am f8d78d2f: am c2f813a3: Merge "Grey out undo/redo/reset according...
authorMichael Kolb <kolby@google.com>
Wed, 15 May 2013 20:37:28 +0000 (13:37 -0700)
committerAndroid Git Automerger <android-git-automerger@android.com>
Wed, 15 May 2013 20:37:28 +0000 (13:37 -0700)
commit25f72e0fb29a52c107947b427a6ccf07ec0fab1b
tree2be5b87cc8feecb731a9c8998905d49e0db2213f
parent3246f64d24cabfe93f237d98b1f5f063d55c4976
parent04d952217a2dd51b86ddecbe4dc56f98329d78a2
am 04d95221: am f8d78d2f: am c2f813a3: Merge "Grey out undo/redo/reset according to state" into gb-ub-photos-bryce

* commit '04d952217a2dd51b86ddecbe4dc56f98329d78a2':
  Grey out undo/redo/reset according to state