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 'febee11ef23a90d620e9a223869f736d0bd63b41':
main
Jean Chalard 2013-09-26 06:30:05 -07:00 committed by Android Git Automerger
commit ec0bf1acc1

Diff Content Not Available