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

* commit 'cae4c914b0bf22a928247ccde278f16ecdb7d783':
main
Jean Chalard 2013-04-17 19:51:23 -07:00 committed by Android Git Automerger
commit 6c76c651e0

Diff Content Not Available