tree 7b3d3f5b7643025d79244881baee98c1ee8af248
parent aa38f3f6b96d92ee9775ce9ed6f6f65b2cf46c04
parent 5b1cdf471641b318140d89739ce8d0d756acb1c6
author Daniel Sandler <dsandler@google.com> 1304011369 -0700
committer Android (Google) Code Review <android-gerrit@google.com> 1304011369 -0700

Merge "Make InputWindow.h's window types align with WindowManager.java's."