Merge "Add missing "try ... finally" safeguards" am: 47ae606d2c
am: 3ef690cd7f
* commit '3ef690cd7f96985310270c893862aa37a279075b':
Add missing "try ... finally" safeguards
Change-Id: I94c01d2939b7dec9dcef7de376ba2fcc4ff868c0
This commit is contained in: