tree 9efce8b4440d4038927dd5636614380653732d97
parent 08fa07c1324421821365d6aac3d334c04f8ec566
parent f64feaac0fec095d93112aef99ed0002931fd65d
author Tao Bao <tbao@google.com> 1526945616 -0700
committer android-build-merger <android-build-merger@google.com> 1526945616 -0700

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

Change-Id: Iaf063b9ed0b485813ac77edb3d610c5b5392487b