| commit | 7def9eac064c25aac50d091b3ae4c6dc00ffb188 | [log] [tgz] |
|---|---|---|
| author | Linux Build Service Account <lnxbuild@localhost> | Fri Apr 13 09:30:37 2012 -0700 |
| committer | QuIC Gerrit Code Review <code-review@localhost> | Fri Apr 13 09:30:37 2012 -0700 |
| tree | 94bb8bc5af1de09428757b178b72309ad23c6733 | |
| parent | 8f839b949ac6807cfead686dfa7df824f7636a56 [diff] | |
| parent | afface826c3a9a6cbdd96817e3fc522dce000486 [diff] |
Merge "Bluetooth: Grace period to re-enable encryption" into msm-3.0