am 69af0b84: am fbffd244: am 25446d31: am 0dd23544: Merge "Very simple refactoring"

* commit '69af0b84906d9a8bbe330958fd88a938361f091c':
main
Jean Chalard 2013-10-03 11:49:20 -07:00 committed by Android Git Automerger
commit bdc7675b98

Diff Content Not Available