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

* commit '112db204c7b00e652c257533b25e3ba8cfb10d95':
main
Jean Chalard 2013-05-15 10:51:17 -07:00 committed by Android Git Automerger
commit 0d4ade9147

Diff Content Not Available