tree 4897da53a13c3d11b191044d84616df13bff2ec3
parent 3982e236fb2dd36d460df4dbf24e07e8ba55b3bd
parent 8bd82155143d6967f9be67555a2913b3f22c1817
author Mindy Pereira <mindyp@google.com> 1330625422 -0800
committer Android (Google) Code Review <android-gerrit@google.com> 1330625422 -0800

Merge "Create settings model."