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

am: dd88112054  -s ours

Change-Id: I59e680bbc6dd9a0895b594cd5a4a5f32719ec4b3
This commit is contained in:
Tao Bao
2018-05-21 16:24:29 -07:00
committed by android-build-merger

Diff Content Not Available