tree ac6c4f0231f2731fc62f817b61bd4ba0b20727a9
parent 16ea8286383e8a426149fd8bc7cb5570560083f4
parent fa6fb4c06881bf9ad1bd87355bf6c0ffeaec9deb
author Kevin Chyn <kchyn@google.com> 1502414563 +0000
committer android-build-merger <android-build-merger@google.com> 1502414563 +0000

Merge "Merge "Fix CTS, Remove CONFIGURE_ASSIST_GESTURE permission" into oc-dr1-dev am: cad75e2437" into oc-dr1-dev-plus-aosp
am: fa6fb4c068

Change-Id: I72ad306a62e999cb15b469887371a1d950228fbf