tree d5224603377a8309b1cb2719bb3afa76bad94b2f
parent b274fd37b8fd5787159b389c658178325006af6f
parent e80e4df1f9b9b60be37ef8ad854d7b46b9dbfb83
author Mike J. Chen <mjchen@google.com> 1392161555 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1392161555 +0000

am e80e4df1: am b45e54f0: Merge "Fix warnings when BLE_INCLUDED is FALSE" into klp-modular-dev

* commit 'e80e4df1f9b9b60be37ef8ad854d7b46b9dbfb83':
  Fix warnings when BLE_INCLUDED is FALSE