tree 0364bdf201607aa498e55cbbc487ec02afbce648
parent e3237d033739db86243214bf1822d6aee95600ab
parent ddb8ced9599ba7fc6825b0274cb04207b57de31d
author Andrei Stingaceanu <stg@google.com> 1505152539 +0000
committer android-build-merger <android-build-merger@google.com> 1505152539 +0000

Merge "TextView longpress 2 haptic feedback fix" into oc-mr1-dev am: 04b6095082
am: ddb8ced959

Change-Id: Id1ebf69c0f3c94f5c505c2bbe2f2dc52cb342fbf