summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorThe Android Open Source Project <initial-contribution@android.com>2012-09-06 08:20:51 -0700
committerAndroid Git Automerger <android-git-automerger@android.com>2012-09-06 08:20:51 -0700
commitfdca9c3fc6a3a6de373c2a4a97c40ed387463006 (patch)
tree3d8a71a9ada694254aad3fc9883888d9b50d2a71
parent23750fc423dfb2aaa1710b706fbb46061ea831c3 (diff)
parentf3541a5f0510c1d3f214358c0b7e06470c6d4b3b (diff)
downloadpackages_apps_settings-fdca9c3fc6a3a6de373c2a4a97c40ed387463006.zip
packages_apps_settings-fdca9c3fc6a3a6de373c2a4a97c40ed387463006.tar.gz
packages_apps_settings-fdca9c3fc6a3a6de373c2a4a97c40ed387463006.tar.bz2
am f3541a5f: (-s ours) Reconcile with jb-mr1-release - do not merge
* commit 'f3541a5f0510c1d3f214358c0b7e06470c6d4b3b':
0 files changed, 0 insertions, 0 deletions