tree 503fd95ca5f553b6fc73e44e5a336ea0b49a27ba
parent cd4f28e999b4aceadb32ec1b46f5538561fde1dd
parent e37aa3612bd361b3d2f3a25895c09b67b32b2289
author Andrew Solovay <asolovay@google.com> 1410974827 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1410974827 +0000

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

* commit '1e36696facbc54e90b69e44779fcf25052594139':
  Docs: Updated to include new Subscriptions functionality.