tree b16e74e857d7372fc2eda05792174047447e2c14
parent 6641ddf6711a7f521df6492db167598ec33d2487
parent 6c6664c95d7935398909e798e0aad451a2a83b1b
author Andrew Solovay <asolovay@google.com> 1410934332 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1410934332 +0000

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

* commit '6c6664c95d7935398909e798e0aad451a2a83b1b':
  Docs: Updated to include new Subscriptions functionality.