tree e18873b577632337b34f5e476f2875b42ab5f6e3
parent 261931a37e12e7e9abd3488ccd4f839a801dccb0
parent 80b18227bf9c9b50a141b379b3f6a0d7e608e66a
author Felipe Leme <felipeal@google.com> 1465429632 +0000
committer android-build-merger <android-build-merger@google.com> 1465429632 +0000

Merge \\\"Improved error handling.\\\" into nyc-dev am: bbd27419ac am: 75e6dde051
am: 80b18227bf

Change-Id: I169f9018575d60d8d503b3a33cd49252266eeaa6