tree da2d8b9265376b13718418d2cea6d5019a111840
parent 4869b2dd661c85b0a5874d9197f379cdd56c2c1d
parent 782f6cd840ce47c56af8da7701064c9f4756c762
author TreeHugger Robot <treehugger-gerrit@google.com> 1512095375 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 1512095375 +0000

Merge changes from topic "am-887aab0f-6382-475c-8f6c-df5f5005ed60"

* changes:
  [automerger] Don't register for stylus input by default. am: e48623efaf
  Don't register for stylus input by default.