Merge branch 'android_branch' into android_bt
Authored by: Eric House 2012-05-06
Parents: [5104ca][64199c]
Child: [c17826]