am 6aa41c22: am f4d115f5: am 9c672b53: am 4552b014: am 0d4ade91: am 112db204: am b0c84b8e: am 03c4f795: am fb49fb9e: am 0ea30200: am 676c97eb: Merge "Remove voodoo magic."

* commit '6aa41c228938dcbd4d48ec254584378adb614022':
main
Jean Chalard 2013-10-03 14:20:19 -07:00 committed by Android Git Automerger
commit f75f8c19c7

Diff Content Not Available