tree 517c1137180bf89c525eeabe4b01fc9b3dc84eec
parent d76f80bd3a38e11d27935cbe461c3a9d4243dd76
parent 6d30f576146725ee81b8cb753584985a2758b566
author Ricardo Cervera <rcervera@google.com> 1412725728 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1412725728 +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