OSDN Git Service

resolved conflicts for merge of cf6f99e7 to jb-dev-plus-aosp
[android-x86/packages-apps-Gallery2.git] / res / values-sr /
2012-06-14 Jean-Baptiste Queruresolved conflicts for merge of cf6f99e7 to jb-dev...
2012-06-11 Jean-Baptiste Queruam b62f354d: am 582c3bb9: Merge "Gallery2: Use ICS...
2012-06-03 The Android Automergermerge in jb-release history after reset to jb-dev
2012-06-01 Eric Fischeram 8da8d1d4: Import translations. DO NOT MERGE
2012-06-01 Eric FischerImport translations. DO NOT MERGE
2012-05-29 The Android Open... Reconcile with jb-release nakasi-factoryrom-release
2012-05-29 The Android Automergermerge in jb-release history after reset to jb-dev
2012-05-25 Eric Fischeram ceab9f07: Import translations. DO NOT MERGE
2012-05-25 Eric FischerImport translations. DO NOT MERGE
2012-05-18 The Android Automergermerge in nakasi-factoryrom-release history after reset...
2012-05-17 Ray ChenMerge "Fix 6479216 Playing a video should go full-scree...
2012-05-17 The Android Automergermerge in jb-release history after reset to jb-dev
2012-05-17 Yuli HuangMerge "Fix card effect shown in opening animation....
2012-05-16 Owen LinMerge "Hide the share button if the shared URI is not...
2012-05-16 Eric Fischeram a30d822e: Import translations. DO NOT MERGE
2012-05-16 Eric FischerImport translations. DO NOT MERGE
2012-05-08 The Android Automergermerge in jb-release history after reset to jb-dev
2012-05-07 Eric Fischeram dc0e7625: Import translations. DO NOT MERGE
2012-05-07 Eric FischerImport translations. DO NOT MERGE
2012-05-07 Hung-ying TyanMerge "Add UNIQUE to EntrySchema." into jb-dev
2012-05-06 The Android Automergermerge in jb-release history after reset to jb-dev
2012-05-05 Martijn CoenenMerge "Add support for Beaming multiple pictures."...
2012-05-04 The Android Automergermerge in jb-release history after reset to jb-dev
2012-05-04 Eric Fischeram 3191875f: Import translations. DO NOT MERGE
2012-05-04 Eric FischerImport translations. DO NOT MERGE
2012-05-04 Ray ChenMerge "Fix 6341866 ANR in com.google.android.gallery3d...
2012-05-03 Eric Fischeram b3dc6118: Merge "Import translations. DO NOT MERGE...
2012-05-03 Eric FischerMerge "Import translations. DO NOT MERGE" into jb-dev
2012-05-03 Eric FischerImport translations. DO NOT MERGE
2012-05-03 The Android Automergermerge in jb-release history after reset to jb-dev
2012-05-02 Eric Fischeram d570731b: Import translations. DO NOT MERGE
2012-05-02 Eric FischerImport translations. DO NOT MERGE
2012-05-02 Owen LinMerge "Add support to draw on texture." into jb-dev
2012-05-02 Owen LinMerge "Fix photo rotates incorrectly in crop image...
2012-05-01 The Android Automergermerge in jb-release history after reset to jb-dev
2012-05-01 Jean-Baptiste Queruam 86c2de0e: am 5e73eda6: Merge "Add missing xhdpi...
2012-04-30 Eric FischerMerge "Import translations. DO NOT MERGE" into jb-dev
2012-04-30 Eric FischerMerge "Import translations. DO NOT MERGE" into jb-dev
2012-04-30 Eric FischerImport translations. DO NOT MERGE
2012-04-30 Eric FischerImport translations. DO NOT MERGE
2012-04-30 The Android Automergermerge in jb-release history after reset to jb-dev
2012-04-30 Yuli HuangMerge "Make 'Edit' behave more consistent with 'Crop...
2012-04-27 Eric FischerImport translations. DO NOT MERGE
2012-04-25 The Android Automergermerge in jb-release history after reset to jb-dev
2012-04-25 Chih-Chung ChangMerge "Remove scissor tests."
2012-04-25 Chih-Chung ChangMerge "Don't do capture animation if we don't have...
2012-04-24 The Android Open... am 082ea423: am 49826d43: Reconcile with ics-mr1-release
2012-04-24 Eric FischerImport translations. DO NOT MERGE
2012-04-23 The Android Automergermerge in jb-release history after reset to master
2012-04-23 Ray ChenMerge "Fix 6208468 21 ANR(s) in: com.google.android...
2012-04-23 Ray ChenMerge "Fix 6046987 The header on the contextual action...
2012-04-20 Owen LinMerge "Fix a UI bug in rendering a rotated image."
2012-04-19 Eric FischerImport translations. DO NOT MERGE
2012-04-18 Chih-Chung Changam 3abf8faf: am 42c1892a: Patch 2 for MR1.
2012-04-18 Chih-Chung Changam 402e680d: am 4745319b: Patch for MR1.
2012-04-18 The Android Automergermerge in jb-release history after reset to master
2012-04-18 Owen LinMerge "Slower scrolling for fling in filmstrip mode."
2012-04-17 Eric FischerImport translations. DO NOT MERGE
2012-04-17 Chih-Chung Changam 3f3316a5: am 81bdb903: am 42c1892a: Patch 2 for...
2012-04-17 Chih-Chung Changam f253572e: am 43b32d04: am 4745319b: Patch for MR1.
2012-04-17 Chih-Chung Changam 51f0fad1: (-s ours) am da7c5fab: am 42c1892a: Patch...
2012-04-17 Chih-Chung Changam 85171a9b: (-s ours) am 0c425fbb: am 4745319b: Patch...
2012-04-03 Mike LockwoodMerge remote-tracking branch 'goog/ics-aah'
2012-02-16 The Android Open... am 09528ef1: am aa5bdb1a: Reconcile with ics-mr1-release
2012-02-16 The Android Open... am be493ca8: am 5e73e2dc: Reconcile with ics-mr1-release
2012-02-10 Justin Hoam 35659b2c: (-s ours) am 70992e04: (-s ours) am a64072...
2012-02-10 Justin Hoam c2bc46ea: (-s ours) am 4e1e57fd: am a64072a4: Merge...
2012-02-10 Eric Fischeram ee7512d6: (-s ours) Merge branch \'ics-scoop-plus...
2012-02-10 Eric Fischeram 4707351e: (-s ours) am 3293fee0: am dfeefe6a: Import...
2012-02-09 Pin TingMerge "Shows image filename read from OpenableColumns."
2012-02-07 The Android Automergermerge in jb-release history after reset to master
2012-02-06 Eric FischerImport translations. DO NOT MERGE
2012-02-06 Eric FischerImport translations. DO NOT MERGE
2012-02-06 The Android Automergermerge in jb-release history after reset to master
2012-02-06 Pin TingMerge "Shows status bar in gallery when in portrait...
2012-02-03 Eric FischerImport translations. DO NOT MERGE
2012-02-03 Eric FischerImport translations. DO NOT MERGE
2012-02-02 Eric FischerImport translations. DO NOT MERGE
2012-02-02 Eric FischerImport translations. DO NOT MERGE
2012-02-01 The Android Open... am b5b73fc7: am 79c31703: Reconcile with ics-mr1-release
2012-01-20 The Android Open... am 7e11af8f: Reconcile with ics-mr1-release
2012-01-17 Chih-Chung Changam a2b62468: am 8f568da3: Patch.
2011-12-09 The Android Open... am 520b7ee0: Reconcile with ics-mr1-release
2011-12-02 The Android Open... Reconcile with ics-mr1-release
2011-12-02 Yuli HuangMerge "Refactor to remove obsolete design and improve...
2011-12-01 Daniel Sandleram a8e684f5: (-s ours) Merge "Remove dependency on...
2011-12-01 Jeff Sharkeyresolved conflicts for merge of c0715fd5 to master
2011-11-30 The Android Open... Reconcile with ics-mr1-release
2011-11-30 Chih-Chung Changam 764482c4: Merge "Fix 5685925: Handle PACKAGE_CHANGED...
2011-11-30 Chih-Chung Changam 002a3fec: Fix 5686493: Crash when try to click any...
2011-11-30 Daniel Sandleram 45fa6771: Merge "Improve screen on/off logic in...
2011-11-30 The Android Automergermerge in ics-release history after reset to master
2011-11-29 Eric Fischeram 4e94e885: (-s ours) Merge "Import revised translatio...
2011-11-29 Jeff Brownam 881fd799: Merge "Add application launch category...
2011-11-29 Eric Fischeram 9db11c5f: Merge "Import revised translations."
2011-11-29 Eric FischerMerge "Import revised translations."
2011-11-29 Eric FischerImport revised translations.
2011-11-29 Wei Huangam 622c2b2c: Merge "Show a dialog to require updating...
2011-11-29 Chih-Chung Changam fc8c503d: Fix 5661035: Accepts bluetooth keys while...
2011-11-22 The Android Open... Reconcile with ics-mr1-release
next