summaryrefslogtreecommitdiffstats
path: root/AndroidManifest.xml
diff options
context:
space:
mode:
authorThe Android Automerger <android-build@android.com>2012-12-17 20:49:51 -0800
committerThe Android Automerger <android-build@android.com>2012-12-17 20:49:51 -0800
commit29a4eb7a33da12a957b3305138ada69140d8ab75 (patch)
tree260be3ae7acecccb7ddf72a06a913149ee41661c /AndroidManifest.xml
parenta374d81605f4ba760db9613dd8aa8d8a0370dab8 (diff)
parent6db1e2495d1a9677d508b51cfd51c4f37f729551 (diff)
downloadpackages_apps_Settings-29a4eb7a33da12a957b3305138ada69140d8ab75.zip
packages_apps_Settings-29a4eb7a33da12a957b3305138ada69140d8ab75.tar.gz
packages_apps_Settings-29a4eb7a33da12a957b3305138ada69140d8ab75.tar.bz2
merge in jb-mr1.1-release history after reset to jb-mr1.1-dev
Diffstat (limited to 'AndroidManifest.xml')
0 files changed, 0 insertions, 0 deletions