Wei Wang 0d68a52ad3 am 9d3e0996: Merge "Add comment of using same callback for start/stop advertising." into klp-modular-dev ...

* commit '9d3e099699c3b6cd0f4bed344607d6a5acd75c1c':
  Add comment of using same callback for start/stop advertising.

2014-03-28 04:07:55 +00:00

..

java

am 9d3e0996: Merge "Add comment of using same callback for start/stop advertising." into klp-modular-dev

2014-03-28 04:07:55 +00:00

jni

resolved conflicts for merge of eaab4df0 to klp-modular-dev-plus-aosp

2014-03-27 12:50:58 +00:00

res

am 2d8f330f: am a686d16d: am 0bc7cea6: Enlarge space allowed for internal downloads.

2014-03-28 01:56:08 +00:00

tests

am 560e7541: am 1b007565: am 9b650702: Merge "Fix state transition verification." into klp-dev

2014-03-18 22:34:17 +00:00