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 '14ed8d7a05869ee28a72380c5752b575b4179866':
main
Jean Chalard 2013-05-15 11:01:13 -07:00 committed by Android Git Automerger
commit 1dd9aeacf6

Diff Content Not Available