tree 8adc4c238d33fdb3af8610fa628d6d410d0b0e29
parent 655e208d5dc1305d9e4eb5301dec0673136151c9
parent dff7d0ec9cb635ef7381e518d32de5b7457dd655
author Michael Kolb <kolby@google.com> 1368644119 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 1368644119 +0000

Merge "Grey out undo/redo/reset according to state" into gb-ub-photos-bryce