am 8036c54d: am ec0bf1ac: am febee11e: 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 '8036c54d9e975f674b64d433c912266b619097be':
main
Jean Chalard 2013-10-03 14:20:11 -07:00 committed by Android Git Automerger
commit 1625e9b1bf

Diff Content Not Available