OSDN Git Service

am 390d5386: (-s ours) am e68188f8: Bluetooth: Restarting PM timer during incoming...
authorJeff Deng <jeffdeng@google.com>
Mon, 18 Aug 2014 18:05:56 +0000 (18:05 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Mon, 18 Aug 2014 18:05:56 +0000 (18:05 +0000)
* commit '390d53864515a53e177de08ecd3130c89adad87a':
  Bluetooth: Restarting PM timer during incoming rfcomm data.


Trivial merge