tree 084dd05990ca2617752412ad91177112d5d7b2b0
parent e67247af4b888a28ce396e50091a0af28ab273f1
parent 6899fa6c81f8a87c10b152a69397641f76a085f0
author Paul McLean <pmclean@google.com> 1499969357 +0000
committer android-build-merger <android-build-merger@google.com> 1499969357 +0000

Merge "More fine-grained exception handling so we can still use non-excepting descriptors." into oc-dr1-dev am: 84a60bf9e8
am: 6899fa6c81

Change-Id: Ic70707c334e9765e7f196bdcb0d2d753ce17b0fb