tree c6b379e6d3b053a94caa97c981e896aa468a02aa
parent 1210f2ab822e4c24333abd4af498ff20af0224fa
parent 5aa26b274595f12e98abaad364cf9e3061b2dfe7
author Mark Salyzyn <salyzyn@google.com> 1402584322 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 1402551282 +0000

Merge "inputflinger: 64-bit compile issues"