Marco Nelissen 7f05beb125 am 334a36b3: Merge "Change the text color of timer in MediaController" ...

* commit '334a36b32c96d26f3aedcca81ab475391414dc80':
  Change the text color of timer in MediaController

2012-11-30 09:55:34 -08:00

..

java

am b1f45c4a: am c3eb57b2: Merge "AudioService: improve initial safe volume delay" into jb-mr1.1-dev

2012-11-30 09:31: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 334a36b3: Merge "Change the text color of timer in MediaController"

2012-11-30 09:55:34 -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