OSDN Git Service

Merge "Settings db upgrade steps only apply to the owner user" into jb-mr1-dev
authorChristopher Tate <ctate@google.com>
Thu, 13 Sep 2012 21:48:19 +0000 (14:48 -0700)
committerAndroid (Google) Code Review <android-gerrit@google.com>
Thu, 13 Sep 2012 21:48:20 +0000 (14:48 -0700)

Trivial merge