tree 0b32cb18efd9ebd595400d86c8ac26b8edf5e2f5
parent ddb8c4ee47e663ca984ff0291fae2cab2c5bc173
parent 6d30f576146725ee81b8cb753584985a2758b566
author Ricardo Cervera <rcervera@google.com> 1412657807 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1412657807 +0000

am 6d30f576: am 3f7b4d8f: Merge "docs: Update Common Intents page with Google Now actions" into klp-modular-docs

* commit '6d30f576146725ee81b8cb753584985a2758b566':
  docs: Update Common Intents page with Google Now actions