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)
commit40036d4793206e58f578436cae6b462f4e29e70c
tree1697b34ccfb832900632de25e0a0b2cf4121bdb8
parent80980cbad5867f10d5ad36687db2c5ef3101b5d7
parent3c9697065497a94e03661c05d636df0187fb95c4
Merge "Turn back on the state panel" into gb-ub-photos-bryce