diff options
| author | Brint E. Kriebel <bekit@cyngn.com> | 2014-07-29 11:18:40 -0700 |
|---|---|---|
| committer | Brint E. Kriebel <bekit@cyngn.com> | 2014-07-29 11:18:40 -0700 |
| commit | 0017e8687a1f80cea17d20ffac25ecea78e5050d (patch) | |
| tree | c10d3732fdfe88288a6519a582e4451103b53eae /res/values-ar/cm_arrays.xml | |
| parent | 48b187fc093e81e93885ad48d8e265513e818818 (diff) | |
| parent | 7b7ee6d5eb19ee24adfc85a47f2a436ea6c4ca8e (diff) | |
| download | android_packages_apps_Trebuchet-0017e8687a1f80cea17d20ffac25ecea78e5050d.tar.gz android_packages_apps_Trebuchet-0017e8687a1f80cea17d20ffac25ecea78e5050d.tar.bz2 android_packages_apps_Trebuchet-0017e8687a1f80cea17d20ffac25ecea78e5050d.zip | |
Merge branch 'cm-11.0' into stable/cm-11.0
Conflicts:
src/com/android/launcher3/Launcher.java
src/com/android/launcher3/OverviewSettingsPanel.java
src/com/android/launcher3/list/SettingsPinnedHeaderAdapter.java
Change-Id: I752b61f7db8bb9dc69d64bbf3ac3fd7926cdc4e3
Diffstat (limited to 'res/values-ar/cm_arrays.xml')
0 files changed, 0 insertions, 0 deletions