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

Merge "Move stuff from recovery into librecovery." into pi-dev-plus-aosp
am: adbf380258

Change-Id: I6ed490a28a7cdd1da3a1564fa9fb96bf2040a77c