tree 27292c5c361bdfeb2b09e03d5756e1005970f123
parent c52b853194553dae146bf19b9279b6290fe8c678
parent 7e18ce221fac387d5f08da2519879c1fc2046a4a
author Tianjie Xu <xunchang@google.com> 1458940871 +0000
committer android-build-merger <android-build-merger@google.com> 1458940871 +0000

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

* commit '7e18ce221fac387d5f08da2519879c1fc2046a4a':
  Clean up intent_file related code in recovery.cpp