OSDN Git Service

am cca464d0: am 4d25bee7: Merge "Turn back on the state panel" into gb-ub-photos...
authornicolasroard <nicolasroard@google.com>
Sat, 16 Feb 2013 00:10:34 +0000 (00:10 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Sat, 16 Feb 2013 00:10:34 +0000 (00:10 +0000)
* commit 'cca464d01a9cd0bdfa10ea467e643609e0f0eda5':
  Turn back on the state panel


Trivial merge