Daniel Sandler 57b47ae95d am 9e129f37: am 924fc3e6: Merge "Add constant for Daydream settings." into jb-mr1.1-dev ...

* commit '9e129f37b6dd6f8c3d1a3869ae60285a414c8558':
  Add constant for Daydream settings.

2012-11-30 13:22:03 -08:00

..

java

am 9e129f37: am 924fc3e6: Merge "Add constant for Daydream settings." into jb-mr1.1-dev

2012-11-30 13:22:03 -08:00

jni

am f264e8e3: am 567a2919: Merge "Stop supplicant and dhcp before start" into jb-mr1.1-dev

2012-11-08 06:14:33 -08:00

res

am 0def7b94: am 849f5188: am 6643ea82: resolved conflicts for merge of 011132a7 to jb-mr1-dev

2012-11-30 10:40:18 -08:00

tests

am 68363456: am 7420ab68: Merge "Utility to format human-friendly durations." into jb-mr1.1-dev

2012-11-15 11:54:43 -08:00