summaryrefslogtreecommitdiffstats
path: root/AndroidManifest.xml
diff options
context:
space:
mode:
authorThe Android Open Source Project <initial-contribution@android.com>2012-07-27 15:45:35 -0700
committerAndroid Git Automerger <android-git-automerger@android.com>2012-07-27 15:45:35 -0700
commit062347a08f29408f188a07a78e0b064fc7218c30 (patch)
tree365346b4c877d12cf28507fb6c538bf130e4effe /AndroidManifest.xml
parent281bcdb98db1ccd14e0e175f193af927de3d528d (diff)
parent115b146cc2dc4b4f9d43b4cd761727d233fc297c (diff)
downloadandroid_packages_apps_Trebuchet-062347a08f29408f188a07a78e0b064fc7218c30.tar.gz
android_packages_apps_Trebuchet-062347a08f29408f188a07a78e0b064fc7218c30.tar.bz2
android_packages_apps_Trebuchet-062347a08f29408f188a07a78e0b064fc7218c30.zip
am 115b146c: Reconcile with jb-mr0-release jb-release
* commit '115b146cc2dc4b4f9d43b4cd761727d233fc297c':
Diffstat (limited to 'AndroidManifest.xml')
0 files changed, 0 insertions, 0 deletions