diff options
| author | Brad Fitzpatrick <bradfitz@android.com> | 2010-10-12 13:52:44 -0700 |
|---|---|---|
| committer | Brad Fitzpatrick <bradfitz@android.com> | 2010-10-12 13:52:44 -0700 |
| commit | 76275ac1c53585a374b5e5f1834631fca9392dd8 (patch) | |
| tree | bfaeb599f6a3664a628a4015bdaf79c3873ca34f /res/layout-xlarge-land | |
| parent | adb4229c23faef81705b6b2fe1dfb8a6474c254c (diff) | |
| parent | 700889f504ef134ab307d95b6bfbbb426ea730e3 (diff) | |
| download | android_packages_apps_Trebuchet-76275ac1c53585a374b5e5f1834631fca9392dd8.tar.gz android_packages_apps_Trebuchet-76275ac1c53585a374b5e5f1834631fca9392dd8.tar.bz2 android_packages_apps_Trebuchet-76275ac1c53585a374b5e5f1834631fca9392dd8.zip | |
resolved conflicts for merge of 700889f5 to master
Change-Id: I85320de6483e6820fe27b4012bfc323ccafa0e04
Diffstat (limited to 'res/layout-xlarge-land')
0 files changed, 0 insertions, 0 deletions