summaryrefslogtreecommitdiffstats
path: root/docs/html/google
diff options
context:
space:
mode:
authorRicardo Cervera <rcervera@google.com>2014-10-07 23:48:48 +0000
committerAndroid Git Automerger <android-git-automerger@android.com>2014-10-07 23:48:48 +0000
commit692bb81c120ae6366f69216274d7845534ef7d73 (patch)
tree517c1137180bf89c525eeabe4b01fc9b3dc84eec /docs/html/google
parentd76f80bd3a38e11d27935cbe461c3a9d4243dd76 (diff)
parent6d30f576146725ee81b8cb753584985a2758b566 (diff)
downloadframeworks_base-692bb81c120ae6366f69216274d7845534ef7d73.zip
frameworks_base-692bb81c120ae6366f69216274d7845534ef7d73.tar.gz
frameworks_base-692bb81c120ae6366f69216274d7845534ef7d73.tar.bz2
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
Diffstat (limited to 'docs/html/google')
0 files changed, 0 insertions, 0 deletions