tree 9b074f8cdd3110c96b8ba57265bda3b9f60c2715
parent 6e18c5edb5494c4889f9910a8679872df5fa4d6e
author Robert Carr <racarr@google.com> 1456791873 -0800
committer Robert Carr <racarr@google.com> 1457034818 -0800

Ensure we apply override configuration to the global one.

We are confusing clients by sending the correctly merged
override and global configurations through the primary
ActivityManager channel but then sending only
the global configuration through the window manager channels
ensure we always merge the configurations prior to sending
them to the client.

Bug: 26454664
Change-Id: I7183365e1c414f9a68564338c60e2f5283ddb57d