tree d99a7b89d60e04a36789d7fd3dec6bcb970b9440
parent ac1caf67c09bdca6e6bbdd8e7a6359e1077c47bb
parent bb56a1512559a5f024ba213c4bdcfe3d9d9387de
author Andy Huang <ath@google.com> 1330377585 -0800
committer Android (Google) Code Review <android-gerrit@google.com> 1330377585 -0800

Merge "Conversation view touch event shenanigans"