tree 9247651f1d7ecad1bfa15deb149aad10bd5f3af0
parent 54ce58ad53ebb792654c717b8722723b13380ab6
parent f4627a80d4417025f65cdf6f32b669180b9992e7
author Kevin Hufnagle <khufnagle@google.com> 1467918331 +0000
committer android-build-merger <android-build-merger@google.com> 1467918331 +0000

Merge \\\\\"docs: Edited \\\\\"Promote with Ads\\\\\" page; created \\\\\"Nearby\\\\\" feature page.\\\\\" into mnc-io-docs am: 31302819c1 am: 5301f68827 am: 557b747fb4 am: e7d21d847e
am: f4627a80d4

Change-Id: Iea3927d9805f9282690b6906e0d01d90d471f18c