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

* commit 'b0c84b8e13e27de68b401af82551ad2ac463a982':
main
Jean Chalard 2013-05-15 10:42:02 -07:00 committed by Android Git Automerger
commit 112db204c7

Diff Content Not Available