Merge "Add debug function." into gingerbread