tree ebc57a33b95b8596cf47e1c6c7820c97009814ef
parent 03901667db75696ccd544809e0e7bc000a99f417
parent 9fe49fc56ef39facf7b3be5f66256bd15a87961f
author Wink Saville <wink@google.com> 1375748581 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1375748581 -0700

am 9fe49fc5: am 523db46f: Merge "Set subscription_mode in the database to a default value"

* commit '9fe49fc56ef39facf7b3be5f66256bd15a87961f':
  Set subscription_mode in the database to a default value