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 '1dd9aeacf6b9f1c54f7d420ca8ad25419b967f86':
main
Jean Chalard 2013-09-26 02:53:21 -07:00 committed by Android Git Automerger
commit febee11ef2

Diff Content Not Available