OSDN Git Service

resolve merge conflicts of b3a0cc6 to stage-aosp-master
authorChih-Hung Hsieh <chh@google.com>
Tue, 28 Jun 2016 17:40:51 +0000 (10:40 -0700)
committerChih-Hung Hsieh <chh@google.com>
Tue, 28 Jun 2016 17:40:51 +0000 (10:40 -0700)
commit3fd32ebb0c0753ab679e9430897273e84f5ef5f0
tree470f64445b0cf22205163746c9d4d19460e72d0c
parent15592437343c909aa6f9cd17f8fdfab422da4965
parentb3a0cc6fab6bb4d7ce0c5134bb011dc8e49dd03b
resolve merge conflicts of b3a0cc6 to stage-aosp-master

Change-Id: Ia40cd728f1d352d9a6611718dda8850afe3dfa63
include/hardware_legacy/wifi_hal.h