am e040aa19: am 0d72a230: am 04bb419c: am ddafcf82: Merge "Fix bugs and add tests"

* commit 'e040aa197ec718434fb3ceeb3d48493bd64adf08':
main
Jean Chalard 2013-04-10 19:47:11 -07:00 committed by Android Git Automerger
commit 41ac21dd2a

Diff Content Not Available