tree 6095e43fabccc3ebc54301e88859e75bfb5434d7
parent c7be9c576e8c0fa0d3c332b35ca2212ddb602a84
parent 13c14c8f8c16bc8b7ba337ad184039d137f4320d
author Hyunyoung Song <hyunyoungs@google.com> 1474408227 +0000
committer android-build-merger <android-build-merger@google.com> 1474408227 +0000

Merge "Fix ExtendedEditText not handling touch correctly b/31555902" into ub-launcher3-calgary-polish
am: 13c14c8f8c

Change-Id: I6dfc939480c54909e34e5ae6747bd22e86fa5368