summaryrefslogtreecommitdiffstats
path: root/packages/SettingsProvider
diff options
context:
space:
mode:
authorJeff Sharkey <jsharkey@android.com>2015-01-09 19:29:24 +0000
committerandroid-build-merger <android-build-merger@google.com>2015-01-09 19:29:24 +0000
commitdf38a1702091ed6d139261d312c5693d89a0f42f (patch)
treeed49abd3088aa3edde6839bc7d03b286222f9b79 /packages/SettingsProvider
parent1ed82edf1df1b1e86929669c4b9e2cac4a6f9283 (diff)
parentd6a8c32a6a2ac07f25f65622366ccb4ccffbdcdd (diff)
downloadframeworks_base-df38a1702091ed6d139261d312c5693d89a0f42f.zip
frameworks_base-df38a1702091ed6d139261d312c5693d89a0f42f.tar.gz
frameworks_base-df38a1702091ed6d139261d312c5693d89a0f42f.tar.bz2
am 2b46774f: Merge "Guard against MountService throwing NPE." into lmp-mr1-dev automerge: 0cb736f
automerge: d6a8c32 * commit 'd6a8c32a6a2ac07f25f65622366ccb4ccffbdcdd': Guard against MountService throwing NPE.
Diffstat (limited to 'packages/SettingsProvider')
0 files changed, 0 insertions, 0 deletions