Merge "Implement support for ALT and SHIFT modifiers"

author Conley Owens <cco3@android.com>

Fri, 29 Apr 2011 16:59:55 +0000 (09:59 -0700)

committer Android Code Review <code-review@android.com>

Fri, 29 Apr 2011 16:59:55 +0000 (09:59 -0700)
author Conley Owens <cco3@android.com>
Fri, 29 Apr 2011 16:59:55 +0000 (09:59 -0700)
committer Android Code Review <code-review@android.com>
Fri, 29 Apr 2011 16:59:55 +0000 (09:59 -0700)
diff --cc libs/ui/InputDispatcher.cpp
Simple merge
author	Conley Owens <cco3@android.com>
	Fri, 29 Apr 2011 16:59:55 +0000 (09:59 -0700)
committer	Android Code Review <code-review@android.com>
	Fri, 29 Apr 2011 16:59:55 +0000 (09:59 -0700)