tree b20c841cd6a32f2c377b5247a866180116c9d451
parent 938199cb0319369c278a7392a768063659507778
parent bc12a725e706ad077c1785c8328af0a569448d0c
author Michael Wright <michaelwr@google.com> 1435164481 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1435164481 +0000

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

* commit 'bc12a725e706ad077c1785c8328af0a569448d0c':
  Add new SOURCE_BLUETOOTH_STYLUS.