am 37fe6081: am 8be310c2: am 29fea7b1: Merge "Added missing header to window.h"

* commit '37fe6081fb9af06f39248d8b3ddd1962076838d2':
  Added missing header to window.h