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

* commit '8be310c21374013e398705418638509bc0efd32a':
  Added missing header to window.h