am 5875362b: am 9613be01: am d0623ad7: Merge "Move some values to a place where they are easier to override"

* commit '5875362b70ad3bc6b62009159d44feea9c11c485':
main
Jean Chalard 2013-04-17 19:46:06 -07:00 committed by Android Git Automerger
commit 24965bb7b4

Diff Content Not Available