summaryrefslogtreecommitdiffstats
path: root/packages/SettingsLib
diff options
context:
space:
mode:
authorTim Kilbourn <tkilbourn@google.com>2015-06-04 21:40:14 +0000
committerAndroid (Google) Code Review <android-gerrit@google.com>2015-06-04 21:40:15 +0000
commit57914802b5c514a84e69b52c8897eaa3a3e74aa7 (patch)
treee103fe055d0aa0323b529df27fa5edc83b5cc0b3 /packages/SettingsLib
parent34df42d59753e7721b346d1048c686d204a44da3 (diff)
parent4bf27b53b97475803fdb85069d500a075aefc801 (diff)
downloadframeworks_base-57914802b5c514a84e69b52c8897eaa3a3e74aa7.zip
frameworks_base-57914802b5c514a84e69b52c8897eaa3a3e74aa7.tar.gz
frameworks_base-57914802b5c514a84e69b52c8897eaa3a3e74aa7.tar.bz2
Merge "DO NOT MERGE Fix DropBoxManager.Entry parcels with fds." into mnc-dev
Diffstat (limited to 'packages/SettingsLib')
0 files changed, 0 insertions, 0 deletions