diff options
| author | Steve Kondik <shade@chemlab.org> | 2012-11-05 12:14:58 -0800 |
|---|---|---|
| committer | Steve Kondik <shade@chemlab.org> | 2012-11-05 12:14:58 -0800 |
| commit | f5baac88b85efa794ae7909f784538f379dd36f2 (patch) | |
| tree | c55b82edcaae558d71fc12f856bb93d9ae8ce8dc /res/values-fa/strings.xml | |
| parent | 5bf25aecb90bd49ca3a8affea877e570b75baed6 (diff) | |
| parent | 4124016ae5c8174aa53433894b896604ffa52c67 (diff) | |
| download | android_packages_apps_Trebuchet-f5baac88b85efa794ae7909f784538f379dd36f2.tar.gz android_packages_apps_Trebuchet-f5baac88b85efa794ae7909f784538f379dd36f2.tar.bz2 android_packages_apps_Trebuchet-f5baac88b85efa794ae7909f784538f379dd36f2.zip | |
Merge branch 'master' of https://android.googlesource.com/platform/packages/apps/Launcher2 into aosp
Conflicts:
res/layout-land/drop_target_bar.xml
src/com/cyanogenmod/trebuchet/AppsCustomizeTabHost.java
src/com/cyanogenmod/trebuchet/Launcher.java
src/com/cyanogenmod/trebuchet/LauncherModel.java
Change-Id: I5aa702e333da27645b0d765b233f4d8a89991cb9
Diffstat (limited to 'res/values-fa/strings.xml')
0 files changed, 0 insertions, 0 deletions