diff options
| author | Ed Heyl <ed@google.com> | 2012-07-29 22:35:28 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2012-07-29 22:35:28 -0700 |
| commit | f63e4b99dd9530372b9afe66ab36324afae0675d (patch) | |
| tree | 710f7bb28670f8df39ab4529c52fce812b471129 /trusty/coverage/coverage_test.cpp | |
| parent | aa79a73f9b047872b0d78b7ec8e17ca63178a38b (diff) | |
| parent | 5039dec74a2541f4674d0e1c4fcb9c8076bec6df (diff) | |
am 5039dec7: am 3cac204d: Merge remote-tracking branch \'goog/jb-dev-mako\' into jb-mr1-dev
* commit '5039dec74a2541f4674d0e1c4fcb9c8076bec6df':
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
Diffstat (limited to 'trusty/coverage/coverage_test.cpp')
0 files changed, 0 insertions, 0 deletions