am ae97a93a: am 86b8b7b4: am 9bf1dfeb: am 2188cbae: Merge "Fix an NPE"

* commit 'ae97a93ab3d585ff4cdee4121686a90e0b5b0934':
main
Jean Chalard 2013-04-03 19:34:06 -07:00 committed by Android Git Automerger
commit db993a5fe4

Diff Content Not Available