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

* commit '4f1af5dd5839c3a63f0c4d4afab76254586b0103':
main
Jean Chalard 2013-10-03 16:18:13 -07:00 committed by Android Git Automerger
commit dbf74704fa

Diff Content Not Available