Merge changes from topic "am-aaa7d89ac39d4f63b72ca511f2b60832" into sc-v2-dev-plus-aosp
* changes: [automerger skipped] Merge "[RESTRICT AUTOMERGE] Revert "Add comment to AndroidManifest"" into rvc-dev am:ed4abe8483
-s ours am:395ac6073c
-s ours am:374ef0012a
-s ours am:504af9e6cd
-s ours am:499e526da1
-s ours [automerger skipped] Merge changes from topic "revert-15207347-add_permission_wifidialog-BFHPHFKILC" into rvc-dev am:259742ebb2
-s ours am:d5ff68889c
-s ours am:b885452051
-s ours am:5c878f37a6
-s ours am:1c6bdf023f
-s ours
This commit is contained in:
committed by
Android (Google) Code Review
commit
22a096c969