am be4ed1e9: am 5b8dd46c: am bc58383e: am 1625e9b1: am 8036c54d: am ec0bf1ac: am febee11e: am 1dd9aeac: am 14ed8d7a: am f32684ea: am df4e24fe: am 24965bb7: am 5875362b: am 9613be01: am d0623ad7: Merge "Move some values to a place where they are easier to override"

* commit 'be4ed1e94411089638f4830aba6e43e4a70f5ba7':
main
Jean Chalard 2013-10-09 19:41:43 -07:00 committed by Android Git Automerger
commit 6de45221df

Diff Content Not Available