am fbf41d4b: am db93243c: am ccb2d269: am 436834bf: am 1f5bce49: am f75f8c19: 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 'fbf41d4b72047e62ab07f13047053a2bfe0433f8':
main
Jean Chalard 2013-10-10 00:16:30 -07:00 committed by Android Git Automerger
commit b90e544081

Diff Content Not Available