OSDN Git Service

Merge "Turn back on the state panel" into gb-ub-photos-bryce
authornicolasroard <nicolasroard@google.com>
Wed, 13 Feb 2013 00:09:31 +0000 (00:09 +0000)
committerAndroid (Google) Code Review <android-gerrit@google.com>
Wed, 13 Feb 2013 00:09:32 +0000 (00:09 +0000)

Trivial merge