tree 9efce8b4440d4038927dd5636614380653732d97
parent adbf38025861a99f61544b7c6fc70f5ce581ce71
parent dd88112054efe423d153ad4980e6657fcab41347
author Tao Bao <tbao@google.com> 1526945069 -0700
committer android-build-merger <android-build-merger@google.com> 1526945069 -0700

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

Change-Id: I59e680bbc6dd9a0895b594cd5a4a5f32719ec4b3