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

* commit '6c76c651e0d0de70f21417ff7116698de8e312e5':
main
Jean Chalard 2013-05-15 10:40:06 -07:00 committed by Android Git Automerger
commit b907a631fc

Diff Content Not Available