am 0d4ade91: am 112db204: am b0c84b8e: am 03c4f795: am fb49fb9e: am 0ea30200: am 676c97eb: Merge "Remove voodoo magic."

* commit '0d4ade9147e53cf28bb4b6415ae09a3f67d0fa9a':
main
Jean Chalard 2013-05-15 11:01:17 -07:00 committed by Android Git Automerger
commit 4552b01435

Diff Content Not Available