Merge "Request application of WindowInsets when setting a content view" into mnc-dev

author Adam Powell <adamp@google.com>

Wed, 17 Jun 2015 22:42:16 +0000 (22:42 +0000)

committer Android (Google) Code Review <android-gerrit@google.com>

Wed, 17 Jun 2015 22:42:17 +0000 (22:42 +0000)
author Adam Powell <adamp@google.com>
Wed, 17 Jun 2015 22:42:16 +0000 (22:42 +0000)
committer Android (Google) Code Review <android-gerrit@google.com>
Wed, 17 Jun 2015 22:42:17 +0000 (22:42 +0000)
diff --cc core/java/android/service/voice/VoiceInteractionSession.java
Simple merge
author	Adam Powell <adamp@google.com>
	Wed, 17 Jun 2015 22:42:16 +0000 (22:42 +0000)
committer	Android (Google) Code Review <android-gerrit@google.com>
	Wed, 17 Jun 2015 22:42:17 +0000 (22:42 +0000)