OSDN Git Service

Merge "Recover from errors" into lmp-dev
authorMarco Nelissen <marcone@google.com>
Tue, 7 Oct 2014 19:31:16 +0000 (19:31 +0000)
committerAndroid (Google) Code Review <android-gerrit@google.com>
Tue, 7 Oct 2014 19:31:17 +0000 (19:31 +0000)

Trivial merge