tree 39e8ef58f51b7d7fa18c11aeaa7e488305eda686
parent 57e0ae249038ed9fda446ae45d0b916110eca50f
parent e7a0394ad468748fb4651c74b44b313e1e07cab6
author Winson Chung <winsonc@google.com> 1312585412 -0700
committer Android (Google) Code Review <android-gerrit@google.com> 1312585412 -0700

Merge "Fixing crash and updating default layout"