tree cc1f187b075f7a69f9edbf52a1bac5cb05de6ac0
parent 481ce238ccc776c86d78cb04010d5ad29fdd32d5
parent 180de7a58c50224e95078acd69843aebd35bf858
author Tianjie Xu <xunchang@google.com> 1458941030 +0000
committer android-build-merger <android-build-merger@google.com> 1458941030 +0000

Merge "Clean up intent_file related code in recovery.cpp" am: 7e18ce2
am: 180de7a

* commit '180de7a58c50224e95078acd69843aebd35bf858':
  Clean up intent_file related code in recovery.cpp