tree 47507ec53b26b2ac34843f032f6aca64a972e360
parent 8da530c9b8bc1ceb803b332bf9ba08d09524f7b2
parent d0ca3379c2dd0f987af328baa3fdad69d0a8d70a
author Amith Yamasani <yamasani@google.com> 1268067751 -0800
committer Android (Google) Code Review <android-gerrit@google.com> 1268067751 -0800

Merge "Fix a SettingsProvider test : 2377540"