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

* commit '0edde0fe3a7725e413e69e360efe4735d0c0fd23':
main
Jean Chalard 2013-10-03 11:47:27 -07:00 committed by Android Git Automerger
commit 87ea56a4a5

Diff Content Not Available