Eric Laurent 942de41bb1 Merge "more fixes on safe volume warning message"

2012-12-06 11:26:40 -08:00

..

java

Merge "more fixes on safe volume warning message"

2012-12-06 11:26:40 -08:00

jni

Merge "Replace run-time modes by compile-time constants"

2012-12-05 16:33:58 -08:00

res

Remove duplicate AndroidManifest.xml entries.

2012-12-05 16:11:42 -08:00

tests

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

2012-11-16 10:37:54 -08:00