Merge "Call onApplyWindowInsets after requestApplyWindowInsets"

author Diego Perez <diegoperez@google.com>

Wed, 11 Jan 2017 15:57:12 +0000 (15:57 +0000)

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

Wed, 11 Jan 2017 15:57:15 +0000 (15:57 +0000)
author Diego Perez <diegoperez@google.com>
Wed, 11 Jan 2017 15:57:12 +0000 (15:57 +0000)
committer Android (Google) Code Review <android-gerrit@google.com>
Wed, 11 Jan 2017 15:57:15 +0000 (15:57 +0000)
diff --cc tools/layoutlib/bridge/src/com/android/layoutlib/bridge/impl/Layout.java
Simple merge
diff --cc tools/layoutlib/bridge/tests/src/com/android/layoutlib/bridge/intensive/Main.java
Simple merge
author	Diego Perez <diegoperez@google.com>
	Wed, 11 Jan 2017 15:57:12 +0000 (15:57 +0000)
committer	Android (Google) Code Review <android-gerrit@google.com>
	Wed, 11 Jan 2017 15:57:15 +0000 (15:57 +0000)
		1	2
tools/layoutlib/bridge/src/com/android/layoutlib/bridge/impl/Layout.java	patch \|	diff1 \|	diff2 \|	blob \| history
tools/layoutlib/bridge/tests/src/com/android/layoutlib/bridge/intensive/Main.java	patch \|	diff1 \|	diff2 \|	blob \| history