tree 7dd77c97380a84a06d27cee5da58c602cda4982b
parent a002fab7c7b037fada818f9082cae5a1e1ffe65c
parent 17586ce7a60d4f3e71ec34cdb3903a915290e527
author Craig Mautner <cmautner@google.com> 1394839867 -0700
committer Craig Mautner <cmautner@google.com> 1394839867 -0700

Merge commit '17586ce7' into manualmerge

Conflicts:
	policy/src/com/android/internal/policy/impl/PhoneWindowManager.java

Change-Id: I4dedf1dc80e224c47cbc020836ad408b641c1d76