Justin Koh 0be0a5039b am 7206ac56: am a79ac472: am 744d3473: Merge "Add hardware feature describing a watch." into klp-modular-dev ...

* commit '7206ac561291298f08809614be95963966a72ca8':
  Add hardware feature describing a watch.

2014-02-20 23:01:25 +00:00

..

java

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

2014-02-20 23:01:25 +00:00

jni

Update framework to enable Skia to run in debug mode.

2014-02-20 14:47:54 -05:00

res

Merge "Import translations. DO NOT MERGE"

2014-02-19 22:14:17 +00:00

tests

am 94b7c749: am 37e6af75: am 92a09fbd: am a14d9c31: Merge "Move Json{Reader,Writer} test to cts."

2014-02-17 18:32:44 +00:00