Merge "Restore dock home support for car docks." into jb-mr2-dev

author Daniel Sandler <dsandler@android.com>

Fri, 19 Apr 2013 18:00:17 +0000 (18:00 +0000)

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

Fri, 19 Apr 2013 18:00:17 +0000 (18:00 +0000)
author Daniel Sandler <dsandler@android.com>
Fri, 19 Apr 2013 18:00:17 +0000 (18:00 +0000)
committer Android (Google) Code Review <android-gerrit@google.com>
Fri, 19 Apr 2013 18:00:17 +0000 (18:00 +0000)
diff --cc policy/src/com/android/internal/policy/impl/PhoneWindowManager.java
Simple merge
author	Daniel Sandler <dsandler@android.com>
	Fri, 19 Apr 2013 18:00:17 +0000 (18:00 +0000)
committer	Android (Google) Code Review <android-gerrit@google.com>
	Fri, 19 Apr 2013 18:00:17 +0000 (18:00 +0000)