summaryrefslogtreecommitdiffstats
path: root/src/com/android/settings
diff options
context:
space:
mode:
authorPrerepa Viswanadham <dham@google.com>2015-05-05 01:05:57 +0000
committerAndroid (Google) Code Review <android-gerrit@google.com>2015-05-05 01:07:17 +0000
commitf09497a2a702484a78b9462fc6d10eb3dc5c430d (patch)
treec64bd69f72d98057c6f4611dab27334f80f55bb3 /src/com/android/settings
parent3066f832435af08bbc2ed5fcef45228d5ff86e33 (diff)
parente42416a4041e2967129c926e9672602e9916d63b (diff)
downloadpackages_apps_Settings-f09497a2a702484a78b9462fc6d10eb3dc5c430d.zip
packages_apps_Settings-f09497a2a702484a78b9462fc6d10eb3dc5c430d.tar.gz
packages_apps_Settings-f09497a2a702484a78b9462fc6d10eb3dc5c430d.tar.bz2
Merge changes from topic 'mwd-merge-050415' into mnc-dev
* changes: Merge commit 'ab489de' into merge_try2 Merge commit 'dd796e8' into merge_try2
Diffstat (limited to 'src/com/android/settings')
0 files changed, 0 insertions, 0 deletions