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

* commit '0dc8c6e9cf2318b038c7bce4d2f1872bcccf70dd':
main
Jean Chalard 2013-04-17 19:45:46 -07:00 committed by Android Git Automerger
commit cae4c914b0

Diff Content Not Available