tree 8811ce81119151b5396f5de898578f794df20092
parent 703424dad7b1ffb7e55fb4780f609e3d3e514f5a
parent 2d09745626af3f3c052da58df5507f92d9244e3a
author Marco Nelissen <marcone@google.com> 1412715522 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1412715522 +0000

am 2d097456: am a130edc3: am 5002d02e: Merge "Recover from errors" into lmp-dev

* commit '2d09745626af3f3c052da58df5507f92d9244e3a':
  Recover from errors