Justin Koh a79ac472d7 am 744d3473: Merge "Add hardware feature describing a watch." into klp-modular-dev ...

* commit '744d3473f8a0f9f95e3fdf83670faf6d1551839e':
  Add hardware feature describing a watch.

2014-02-20 17:41:31 +00:00

..

java

am 744d3473: Merge "Add hardware feature describing a watch." into klp-modular-dev

2014-02-20 17:41:31 +00:00

jni

am fca204a4: am 05cebdc2: Merge "Fix several bad function definitions."

2014-02-20 13:02:25 +00:00

res

am 16c0b295: am bba3a694: Merge "Telephony API extension v2"

2014-02-13 08:44:55 +00:00

tests

Move Json{Reader,Writer} test to cts.

2014-02-17 17:51:43 +00:00