summaryrefslogtreecommitdiffstats
path: root/AndroidManifest.xml
diff options
context:
space:
mode:
authorAdam Cohen <adamcohen@google.com>2013-12-03 07:07:33 -0800
committerAndroid Git Automerger <android-git-automerger@android.com>2013-12-03 07:07:33 -0800
commit87f445c8b28c59e787e5fbfc7ba223e112d2263f (patch)
treea0d55fb1fec951ccbf5d4672c1ce78d06cdb1c3c /AndroidManifest.xml
parent16fa074d824ed64c02e8ac3bca6cc7eaab6db509 (diff)
parentc924cacfab4144eefdf8e46dfc82d79cb15e9c96 (diff)
downloadandroid_packages_apps_Trebuchet-87f445c8b28c59e787e5fbfc7ba223e112d2263f.tar.gz
android_packages_apps_Trebuchet-87f445c8b28c59e787e5fbfc7ba223e112d2263f.tar.bz2
android_packages_apps_Trebuchet-87f445c8b28c59e787e5fbfc7ba223e112d2263f.zip
am c924cacf: Merge "Only import workspaces for non-tablets (where grid hasn\'t changed)" into jb-ub-now-jolly-elf
* commit 'c924cacfab4144eefdf8e46dfc82d79cb15e9c96': Only import workspaces for non-tablets (where grid hasn't changed)
Diffstat (limited to 'AndroidManifest.xml')
0 files changed, 0 insertions, 0 deletions