Zhihai Xu c8a4d7d089 Merge "Revert "Bluetooth stopped working in master - "bad file descriptor"""

2013-07-26 18:15:13 +00:00

..

java

Merge "Revert "Bluetooth stopped working in master - "bad file descriptor"""

2013-07-26 18:15:13 +00:00

jni

Merge "replace cutils/logger.h with log/logger.h"

2013-07-25 21:39:31 +00:00

res

Merge "Change XML-grammar for (Off)HostApduServices."

2013-07-26 16:52:55 +00:00

tests

am b8292830: resolved conflicts for merge of a920f25f to jb-mr2-dev-plus-aosp

2013-06-28 16:53:27 -07:00