summaryrefslogtreecommitdiffstats
path: root/packages/SettingsProvider
diff options
context:
space:
mode:
authorJeff Brown <jeffbrown@google.com>2014-05-21 02:38:11 +0000
committerAndroid Git Automerger <android-git-automerger@android.com>2014-05-21 02:38:11 +0000
commitccf51bef288652cb618a566a376173e252b84af0 (patch)
tree5b8dc8df4ca657abba9835f9099dd1c39536f41d /packages/SettingsProvider
parent8f120dd6d631ac632d3356b81403a53f958021f0 (diff)
parent2d9b513dab78242281bca125b4abc6b8235089a6 (diff)
downloadframeworks_base-ccf51bef288652cb618a566a376173e252b84af0.zip
frameworks_base-ccf51bef288652cb618a566a376173e252b84af0.tar.gz
frameworks_base-ccf51bef288652cb618a566a376173e252b84af0.tar.bz2
am 2d9b513d: Merge "I\'m feeling the good vibrations." into klp-modular-dev
* commit '2d9b513dab78242281bca125b4abc6b8235089a6': I'm feeling the good vibrations.
Diffstat (limited to 'packages/SettingsProvider')
0 files changed, 0 insertions, 0 deletions