tree 6caf4fa4f453b4ceb1c01faf9ba618a3c06f3fe9
parent ba9d58516cbd544df67454922c23b0597fc01fcf
parent 67267dcf909e080ea3adf902c8a9df115bd1b279
author Andrew Solovay <asolovay@google.com> 1410973786 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1410973786 +0000

am 67267dcf: am 6c6664c9: am a209406f: Merge "Docs: Updated to include new Subscriptions functionality." into klp-modular-docs

* commit '67267dcf909e080ea3adf902c8a9df115bd1b279':
  Docs: Updated to include new Subscriptions functionality.