[automerger skipped] Merge "Move stuff from recovery into librecovery." am: 901f0c3516 am: dd88112054 -s ours

am: f64feaac0f  -s ours

Change-Id: Iaf063b9ed0b485813ac77edb3d610c5b5392487b
This commit is contained in:
Tao Bao
2018-05-21 16:33:36 -07:00
committed by android-build-merger

Diff Content Not Available