| commit | bff407d8d17a45bfa2eb54d90b2efdb4a1d19570 | [log] [tgz] |
|---|---|---|
| author | Zhoulu Luo <zluo@codeaurora.org> | Wed Sep 24 14:35:38 2014 -0700 |
| committer | Zhoulu Luo <zluo@codeaurora.org> | Wed Sep 24 14:35:38 2014 -0700 |
| tree | e63e94f7d783cff06c2bbfafee204753f31067d6 | |
| parent | a594dff97271c86558267881b5efd3fd3a251c34 [diff] | |
| parent | e108eda0ff15e81451f4fe02cbea5d708bc02139 [diff] |
Merge tag 'AU_LINUX_ANDROID_KK.04.04.04.010.171' into HEAD AU_LINUX_ANDROID_KK.04.04.04.010.171 based on quic/aosp/kk Conflicts: src/org/codeaurora/bluetooth/pbapclient/BluetoothPbapObexSession.java Change-Id: I6366caf12520543f172ec7006099ca135cf5e896