OSDN Git Service

merge in master-release history after reset to master
[android-x86/packages-apps-Settings.git] / proguard.flags
2014-02-21 Jeff SharkeyMerge "Settings: Fix the memory leak in Settings"
2014-02-06 Jeff SharkeyMerge "Total and available fields missing in Settings...
2014-02-05 Amith Yamasaniam 8f948217: am c68a6bde: am 0ad77445: am 7c0ada65...
2014-02-05 Amith Yamasaniam 7c0ada65: am 3f722079: am 1ba09366: am 0fce6123...
2013-12-04 Amith YamasaniMerge "Fix switching running/cached apps with memory...
2013-11-22 The Android Open... Merge commit 'bc6aa63a1afe5f50c3d03d8241f48cc4f6320c2e...
2013-11-05 Elliott Hughesam 98f5e186: am c3a6cd6e: Merge "Move a line into try...
2013-09-27 Amith Yamasaniam 8cfce5de: (-s ours) am da0e4483: am aad8d90c: am...
2013-09-27 Amith Yamasaniam b4881f79: am 451d8225: am 49187c94: am 53a56ad8...
2013-09-20 Elliott Hughesam aeb1fa77: am 10fdcab4: Merge "Fix time zone formatti...
2013-09-13 Elliott Hughesam 3d83f5ca: am caeb7a6e: Merge "Get time zone names...
2013-09-12 Amith Yamasaniam ad541608: am ad0f0edb: Merge "Call to equals() compa...
2013-09-12 Amith YamasaniMerge "Call to equals() comparing different types"
2013-09-06 The Android Automergermerge in master-release history after reset to master
2013-08-31 Wink Savilleam d5c71fc4: am e38165ca: am 7bee4c29: Use correct...
2013-08-29 Wink Savilleam 1bc2db22: am 0e042a44: am 289c2f0d: Merge "Use MOBIL...
2013-08-29 Baligh Uddinam f7b5ad80: (-s ours) am da7395d6: (-s ours) am c79028...
2013-08-29 Baligh Uddinam 439b1543: (-s ours) am 17d0af91: (-s ours) Import...
2013-08-28 Baligh Uddinam d866be38: (-s ours) am 1caeb5a1: (-s ours) am d8c9c1...
2013-08-28 Baligh Uddinam 56fc8b77: (-s ours) am 04a25289: (-s ours) Import...
2013-08-22 Baligh Uddinam 06de3680: (-s ours) am 56c597c1: (-s ours) am bf65bf...
2013-08-22 Baligh Uddinam f3381a80: (-s ours) am f23da91e: (-s ours) Import...
2013-08-19 Baligh Uddinam 1df37ff1: (-s ours) am 2b851859: (-s ours) am b09878...
2013-08-19 Baligh Uddinam 5c601791: (-s ours) am 8485f115: (-s ours) Import...
2013-08-19 Baligh Uddinam 21cbd017: (-s ours) am e37538b1: (-s ours) am 8c6de9...
2013-08-16 Baligh Uddinam a7238c18: (-s ours) am dbf26e70: (-s ours) Import...
2013-08-15 Robert Greenwaltam a1fa7cef: am 1faefa06: Merge "Fix one NPE in tetheri...
2013-08-13 Baligh Uddinam 508997ad: (-s ours) am 728da455: (-s ours) am 03ae9b...
2013-08-13 Baligh Uddinam 08f1d439: (-s ours) am 05404105: (-s ours) Import...
2013-08-08 Baligh Uddinam 7256942b: (-s ours) am d01ca3ce: (-s ours) Merge...
2013-08-08 The Android Open... am f4316f6d: (-s ours) Reconcile with jb-mr2-release...
2013-08-08 Baligh Uddinam b4d720f9: (-s ours) am 9a53339d: (-s ours) am e211fd...
2013-08-08 Baligh Uddinam 7256942b: (-s ours) am d01ca3ce: (-s ours) Merge...
2013-08-08 The Android Open... am f4316f6d: (-s ours) Reconcile with jb-mr2-release...
2013-08-08 Baligh Uddinam b4d720f9: (-s ours) am 9a53339d: (-s ours) am e211fd...
2013-08-08 Lifu TangMerge "Finished the location settings"
2013-08-07 Jason MonkMerge "Restriction pin changes."
2013-08-07 Baligh UddinMerge "Import translations. DO NOT MERGE"
2013-08-07 The Android Automergermerge in klp-release history after reset to master
2013-08-07 Martijn CoenenMerge "NFC payment settings."
2013-08-07 Martijn CoenenNFC payment settings.
2013-07-19 Robert Greenwaltresolved conflicts for merge of 4d9f670b to stage-aosp...
2013-06-28 Robert Greenwaltam a1454529: Merge "Dont enable Wi-Fi if it\'s not...
2013-06-27 Elliott Hughesam 5f6e4339: Merge "Use SimpleDateFormat for time zone...
2013-06-25 Elliott Hughesam 02e23fb0: Merge "Clamp date setting for the SetupWiz...
2013-06-06 Alex Klyubinresolved conflicts for merge of 5d21820a to jb-mr2-dev
2013-06-06 Alex Klyubinam 5aa3f878: (-s ours) am 0c32da7e: am 6f28e342: am...
2013-06-06 Dianne Hackbornam 9cd1d5e2: (-s ours) am a9a28d2f: am f96a86c9: am...
2013-05-30 Jean-Baptiste QueruIgnore 81476405 from AOSP
2013-05-21 Amith Yamasaniam 4abe488a: Merge "No back icon in action bar of APN...
2013-04-30 Kenny Rootresolved conflicts for merge of 3c10f535 to jb-mr2...
2013-04-27 Kenny Rootam c814271f: Merge "Fix Clear Credentials item"
2013-04-16 Amith Yamasaniam c1e3983b: Merge "Fix NullPointerException at Running...
2013-04-16 Amith Yamasaniam 91b5fab9: Merge "Check if the Activity is finishing...
2013-04-08 Kenny Rootresolved conflicts for merge of 3a271718 to jb-mr2...
2013-03-29 Kenny Rootam 43366b2c: Merge "Add KeyStore storage type to Settin...
2013-03-28 Kenny Rootam 0d52fc18: am 9dc478ec: Merge "Add ability to install...
2013-03-20 Jeff Sharkeyam f8db32d8: am 74fd506b: Merge "Enable Ethernet tab...
2013-03-17 Robert Greenwaltam cd1c38cf: am ae9ebfd1: Merge "add MVNO field for...
2013-03-14 Elliott Hughesam 93692c36: am 53309365: Merge "use date from 1970...
2013-03-12 Amith Yamasaniam 8749f35f: am 506b68e1: Merge "Moved KEY_VIBRATE...
2013-03-11 Jean-Baptiste Queruam 565af383: am 33adccd2: am 9cff5e3f: am f4b1aefb...
2013-03-08 Amith Yamasaniam 6e0bff0d: Merge "Fix the message when Bluetooth...
2013-03-05 Irfan Sheriffam ba6a68c8: Merge "Fix not updating error message...
2013-02-22 Baligh UddinMerge "Import translations. DO NOT MERGE"
2013-02-22 Irfan SheriffMerge "Clean up scan handling"
2013-02-22 Daniel SandlerMerge "Proguard fix: include notification settings...
2013-02-22 Daniel SandlerProguard fix: include notification settings fragment.
2012-08-13 Jean-Baptiste QueruMerge "Settings: Use ICS alert drawable"
2012-08-01 Justin Koham 7b065464: Move BT settings appliance check after...
2012-07-03 Irfan Sheriffam 2fad853b: Merge "Limit length of SSID input string...
2012-07-03 Irfan Sheriffam d80ff0a4: Merge "wifi: update text displayed during...
2012-06-14 Jean-Baptiste Queruam 60ec22d1: (-s ours) Merge "Settings: Fixed German...
2012-06-12 Jean-Baptiste Queruresolved conflicts for merge of 051f46d7 to jb-dev...
2012-06-11 Jean-Baptiste Queruam c56b0146: Merge "Fixing pin_too_short text"
2012-06-08 Jean-Baptiste Queruam 5a0b3230: Merge "Add account type check for invisibl...
2012-05-25 Amith Yamasaniam 8ad7abbc: Merge "Corrected return value for updatePr...
2012-05-22 Jean-Baptiste Queruam 1a47dff3: Merge "Remove title bar background drawabl...
2012-05-21 Jean-Baptiste Queruam c0653a12: Merge "Expandable NumberPicker width in...
2012-05-04 Wink Savilleam 69801b36: Merge "RadioInfo: Update the network type...
2012-05-03 Amith Yamasaniam b3c17c57: Merge "Removing static reference from...
2012-05-01 Jean-Baptiste Queruam 299ed152: (-s ours) Merge "Wifi: Update message...
2012-05-01 Justin Koham 519dda9c: Disables BluetoothPairingDialog if in...
2012-05-01 Jean-Baptiste Queruam 7bb1c807: Merge "Settings: PT-BR translation fix"
2012-04-14 Eric Fischeram dad12ddb: (-s ours) am 6ce339f6: Import translations...
2012-04-14 Eric Fischeram ee365b41: (-s ours) Import translations. DO NOT...
2012-04-10 Eric Fischeram 13741f2f: (-s ours) Import translations. DO NOT...
2012-04-05 Eric Fischeram a3b3f7e8: (-s ours) am d52d02bf: Import translations...
2012-03-31 Eric Fischeram 5797c502: (-s ours) am ca0d6822: Import translations...
2012-03-30 Eric Fischeram f8512644: (-s ours) am 841ad7ba: Import translations...
2012-03-29 Irfan SheriffMerge "Fix discovery state tracking"
2012-03-28 The Android Automergermerge in jb-release history after reset to master
2012-03-28 Kenny RootMerge "Convert to new KeyStore format"
2012-03-28 Kenny RootMerge "Update Wifi to use new keystore function"
2012-03-28 Kenny RootMerge "Switch VPN to use keystore ENGINE"
2012-03-27 Eric Fischeram fe8b3e9a: (-s ours) am f4ce8c93: Import translations...
2012-03-27 Eric FischerMerge "Import translations. DO NOT MERGE"
2012-03-27 Amith YamasaniMerge "User management screens"
2012-03-27 Amith YamasaniUser management screens
2012-03-27 Eric Fischeram 819c7192: (-s ours) am c51c5310: Import translations...
next