Merge "Disable preferences until appropriate data are loaded"
authorDaisuke Miyakawa <dmiyakawa@google.com>
Fri, 23 Mar 2012 20:51:07 +0000 (13:51 -0700)
committerAndroid (Google) Code Review <android-gerrit@google.com>
Fri, 23 Mar 2012 20:51:07 +0000 (13:51 -0700)
commitea9d8457019abef47b63ef239738ce077f305476
tree96a3b54bbda3681100e7a942c26f14690e41d549
parentaa3681c26db0313e5db24c82b0280d56894f24d9
parent0464985edc323b17bc60542630b800357cbb799b
Merge "Disable preferences until appropriate data are loaded"