am fa966de2: am 864c3d1b: am 80259899: Merge "doc: add developing and testing info to backup guide" into froyo