| commit | 5039dec74a2541f4674d0e1c4fcb9c8076bec6df | [log] [tgz] |
|---|---|---|
| author | Ed Heyl <ed@google.com> | Sun Jul 29 22:33:11 2012 -0700 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Sun Jul 29 22:33:11 2012 -0700 |
| tree | 710f7bb28670f8df39ab4529c52fce812b471129 | |
| parent | f40b247f6602b4f660c41b3850a2466696bf9073 [diff] | |
| parent | 3cac204d3537c6a356c922bffb07fcb97f5bb0c7 [diff] |
am 3cac204d: Merge remote-tracking branch \'goog/jb-dev-mako\' into jb-mr1-dev * commit '3cac204d3537c6a356c922bffb07fcb97f5bb0c7': bluetooth: add property permission for bluetooth Export flags needed for ifc_reset_connections API in netutils remove an anonymous typedef HACK: push ramdisk up by 2M HACK: use /firmware/image as a 3rd choice libnl_2: compile as shared library as well