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 'f32684ea9b7be86499900f22a78e3e6b80dc6f18':
main
Jean Chalard 2013-05-15 10:51:14 -07:00 committed by Android Git Automerger
commit 14ed8d7a05

Diff Content Not Available