tree 53534e1510ce2fc97559965deec3bbf17dc1ceff
parent 4938c2425cea1eed385eb0f8a2f69bf742bc1889
parent a93909ffe93c9f5e27e493f32a78aab6fbf3e06e
author Spike Sprague <spikuru@google.com> 1394570641 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 1394570641 +0000

Merge "capture button disabled states support" into gb-ub-photos-denali