tree c9e2d7270d6f2a0a1c501ff7d4c8f45d7b09d10e
parent 0cf4bd3bca7b085112918383b6137822cf2e0655
parent edca8aa3a8046dc5168b750ff961fc91beafa372
author Alex Naidis <alex.naidis@linux.com> 1483981771 +0000
committer android-build-merger <android-build-merger@google.com> 1483981771 +0000

Merge "StorageManager: Improve exception handling" am: cf3a4a68bd am: 545cf37844
am: edca8aa3a8

Change-Id: Idbd8b16f0825bdcf48d2013448c767d0966434fe