From: Su, Weihua <weihua.x.su@sonymobile.com>
Date: Mon, 20 Mar 2017 17:18:40 +0000 (+0000)
Subject: Merge "Fix crash issue on Storage Manager app" am: cb4a3c55cf
X-Git-Tag: android-x86-8.1-r1~2121^2~42
X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=5fc179b22d;p=android-x86%2Fframeworks-base.git

Merge "Fix crash issue on Storage Manager app" am: cb4a3c55cf
am: 69be98ae52

Change-Id: Iaa7f97df590cbf93e1d5c942dae5f3be55988f11
---

5fc179b22d59a035ff6c15bf07463f767bc6f008