tree c888976855692a610828fab0980b5405b6bd2859
parent f9760421a7d9fe7e371ae3e14c3d3502a57e228e
parent 02791a78f1673ff970446df7025edee19861cca1
author Michael Wright <michaelwr@google.com> 1435163658 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1435163658 +0000

am 02791a78: am 5edd0e06: Merge "Add new SOURCE_BLUETOOTH_STYLUS." into mnc-dev

* commit '02791a78f1673ff970446df7025edee19861cca1':
  Add new SOURCE_BLUETOOTH_STYLUS.