tree 4dda0d2b987e83f178c268161c6fcc1bbfc4bd5b
parent db38b71a945ec2ceddb71dae119b27bf4bc6be7d
parent fff08f9ad366ec55f94b7f29627023fd3fce65ae
author Sudheer Shanka <sudheersai@google.com> 1497572399 +0000
committer android-build-merger <android-build-merger@google.com> 1497572399 +0000

Merge "Catch Throwable instead of Exception." into oc-dev
am: fff08f9ad3

Change-Id: Icfeb980db876fe2c73f86e4982429b6b94bfc08a