tree c194eb54486f4b372ca122965282ddbe0a434826
parent fecfadb5084d89d987e4b4f0793feb8c18897a3d
parent 000293c93b41f69857f228d085b6f44b9afa34b0
author Olawale Ogunwale <ogunwale@google.com> 1427214303 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1427214303 +0000

am 000293c9: Merge "Layout the window to be displayed if it would be resized"

* commit '000293c93b41f69857f228d085b6f44b9afa34b0':
  Layout the window to be displayed if it would be resized