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

* commit '24965bb7b49f689f1ecb7b6cdd4990625286dbc7':
main
Jean Chalard 2013-04-17 19:51:45 -07:00 committed by Android Git Automerger
commit df4e24fe9d

Diff Content Not Available