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

* commit 'b907a631fc9f2392100ec271e1113a083cd3df78':
main
Jean Chalard 2013-05-15 10:50:53 -07:00 committed by Android Git Automerger
commit a1b9258eaa

Diff Content Not Available