tree fdf65ddbd8ceb2740e8aa26157d64b35f148601d
parent 3a5e2013a1296065a4674bdc43f357d3a352a6e9
parent 523db46f6981a40e12007dbbe629bbdc47f861ba
author Wink Saville <wink@google.com> 1375748413 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1375748413 -0700

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

* commit '523db46f6981a40e12007dbbe629bbdc47f861ba':
  Set subscription_mode in the database to a default value