Justin Koh 68ca14648c am ed23c5bc: Hide NsdServiceInfo additions for KKWT DO NOT MERGE ...

* commit 'ed23c5bc12b4110435b1e6f5fb9b82716109136e':
  Hide NsdServiceInfo additions for KKWT DO NOT MERGE

2014-05-05 22:21:03 +00:00

..

java

am ed23c5bc: Hide NsdServiceInfo additions for KKWT DO NOT MERGE

2014-05-05 22:21:03 +00:00

jni

am 70344223: am fbb0ab02: Merge "Fix broken logging in Zygote.cpp."

2014-05-01 10:22:56 +00:00

res

am 60158445: Merge "Make global action key timeout configurable." into klp-modular-dev

2014-05-02 17:28:53 +00:00

tests

am 1edfd835: Merge "add getAddress function to return BT mac" into klp-modular-dev

2014-05-03 00:35:26 +00:00