am 0dac8e52: am 8ab3c1bf: am d893fe5d: Merge "Don\'t put spaces before and after asterisks"

* commit '0dac8e525da17621b86e02b0df6d007b62392dba':
main
Jean Chalard 2013-09-26 07:33:01 -07:00 committed by Android Git Automerger
commit 0edde0fe3a

Diff Content Not Available