tree 416895a6857f461f7bca85ea2238c2d36984417e
parent 0c880603dba9f9f09523509f19c6808ba8f52e12
parent 1292dd82812d76c54568796fbdafd1fdadc816eb
author Matthew Xie <mattx@google.com> 1393252142 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1393252142 +0000

am 1292dd82: am 6bc62a36: Merge "Bluetooth: GAP: Update bonded device info immediately on NVRAM"

* commit '1292dd82812d76c54568796fbdafd1fdadc816eb':
  Bluetooth: GAP: Update bonded device info immediately on NVRAM