OSDN Git Service

resolved conflicts for merge of 13ef17a3 to mnc-dr-dev
[android-x86/packages-apps-Launcher3.git] / res / values-en-rAU / strings.xml
2015-07-22 Hyunyoung Songresolved conflicts for merge of 13ef17a3 to mnc-dr-dev
2015-03-26 The Android Automergeram 51160caf: (-s ours) am aae99eaa: am b2b58c8f: merge...
2015-03-26 Sunny GoyalMerge "Revert "Configuration of workspace through app...
2015-03-23 Andrei KapishnikovMerge "Configuration of workspace through app restrictions"
2015-03-21 Geoff MendalImport translations. DO NOT MERGE