Commits
Chris Tate authored and Android Git Automerger committed 516e0cef2d8M
am 96b6acda: am 8b52be33: (-s ours) am c0a2254e: Merge "Clean up properly if outcall for doRestoreFinished() fails" into mnc-dev * commit '96b6acdaf0ffabd6fb1f49b032350805d8721dc5':
Showing diff to214f09bd2f5