tree 20a123a5cea308c140a70635a41eb38fa2229b72
parent 49c4aca3a820a78decb026202245e3fac00cc748
parent a8cb0993e871865fd376b7358095646909ac02d9
author Kevin Chyn <kchyn@google.com> 1504066945 +0000
committer android-build-merger <android-build-merger@google.com> 1504066945 +0000

Merge "Update comment for ASSIST_GESTURE_TRIGGERED" into oc-mr1-dev am: 102e9e7858
am: a8cb0993e8

Change-Id: I0cbbb21048b9ffc06840e913eceaeaa1ba7bf349