tree 06f8cab376e512b4295280963ee7f26878dd8cd5
parent 7fc3b6c00b55e15881d1f098666399b674a64e42
parent 574690b13c8f0d4835c6d86b8e26fc4c9b914037
author Joe Fernandez <joefernandez@google.com> 1431618038 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1431618038 +0000

am 574690b1: Merge "docs: Add weekly subscriptions and grace period information to IAB docs" into lmp-mr1-ub-docs

* commit '574690b13c8f0d4835c6d86b8e26fc4c9b914037':
  docs: Add weekly subscriptions and grace period information to IAB docs