tree 8982724b8b6cd6742c15f59b164a078e81ce7c1d
parent 684d255b110a538b98f57db933d6fe53c267b8c0
parent 4609778204104bb83eb9cc6de9f02eee390ed8f9
author Tianjie Xu <xunchang@google.com> 1508538049 +0000
committer android-build-merger <android-build-merger@google.com> 1508538049 +0000

Merge "Finish the new data receiver when update fails" am: 9831ef389b am: 85fca1fc57
am: 4609778204

Change-Id: I2b82e90d2adc859fa6781c7ff82dcfed1bd15b91