docs: Added note about permission/feature changes with network/GPS.

author Kevin Hufnagle <khufnagle@google.com>

Tue, 13 Sep 2016 05:57:38 +0000 (05:57 +0000)

committer android-build-merger <android-build-merger@google.com>

Tue, 13 Sep 2016 05:57:38 +0000 (05:57 +0000)
author Kevin Hufnagle <khufnagle@google.com>
Tue, 13 Sep 2016 05:57:38 +0000 (05:57 +0000)
committer android-build-merger <android-build-merger@google.com>
Tue, 13 Sep 2016 05:57:38 +0000 (05:57 +0000)
diff --cc docs/html/guide/topics/manifest/uses-feature-element.jd
Simple merge
author	Kevin Hufnagle <khufnagle@google.com>
	Tue, 13 Sep 2016 05:57:38 +0000 (05:57 +0000)
committer	android-build-merger <android-build-merger@google.com>
	Tue, 13 Sep 2016 05:57:38 +0000 (05:57 +0000)