summaryrefslogtreecommitdiffstats
path: root/res/layout-xlarge-land
diff options
context:
space:
mode:
authorJean-Baptiste Queru <jbq@google.com>2010-10-12 13:57:11 -0700
committerAndroid Git Automerger <android-git-automerger@android.com>2010-10-12 13:57:11 -0700
commitf93a49422ba1516492a29f0563285d06d079404e (patch)
tree36b2212b819b45708aa25090a7a9e5a711dd652d /res/layout-xlarge-land
parent76275ac1c53585a374b5e5f1834631fca9392dd8 (diff)
parente90cc3ba6c6ccd383f31b539367c2cccea278fed (diff)
downloadandroid_packages_apps_Trebuchet-f93a49422ba1516492a29f0563285d06d079404e.tar.gz
android_packages_apps_Trebuchet-f93a49422ba1516492a29f0563285d06d079404e.tar.bz2
android_packages_apps_Trebuchet-f93a49422ba1516492a29f0563285d06d079404e.zip
am e90cc3ba: resolved conflicts for merge of 35e79e32 to gingerbread-plus-aosp
Merge commit 'e90cc3ba6c6ccd383f31b539367c2cccea278fed' * commit 'e90cc3ba6c6ccd383f31b539367c2cccea278fed': Replaced /sdcard with Environment.getExternalStorageDirectory()
Diffstat (limited to 'res/layout-xlarge-land')
0 files changed, 0 insertions, 0 deletions