tree 2e5adf47eed5fd7a64de1e50e185cfd63c15aaa0
parent e4ad0055a8e9d701cde2ccc16eb779c718393014
parent bbd27419ac2a28fdfa2cf637f5f642a26a11eed8
author Felipe Leme <felipeal@google.com> 1465429278 +0000
committer android-build-merger <android-build-merger@google.com> 1465429278 +0000

Merge \"Improved error handling.\" into nyc-dev
am: bbd27419ac

Change-Id: I55a0eb324d18c7081acb6387b51c2fdf4f7b2a62