OSDN Git Service

Import translations. DO NOT MERGE
[android-x86/packages-apps-Settings.git] / Android.mk
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 Alex Klyubinam 01dbfbf9: am efd88e2c: Merge "Permit deactivation...
2013-06-06 Alex Klyubinam 60544e74: am 3dddd8cb: Ensure all active Device...
2013-06-06 Alex Klyubinam efd88e2c: Merge "Permit deactivation of malformed...
2013-06-06 Alex Klyubinam 3dddd8cb: Ensure all active Device Admins are listed.
2013-06-06 Dianne Hackbornam 9cd1d5e2: (-s ours) am a9a28d2f: am f96a86c9: am...
2013-06-06 Dianne Hackbornam 5f28c77b: am d6086125: Fix issue #9074296: Device...
2013-06-06 Dianne Hackbornam d6086125: Fix issue #9074296: Device Admins can...
2013-04-12 Maggie BenthallMerge "Implement Settings app UX for when a user has...
2013-04-12 Emily BernierMerge "User restrictions for creds storage & user remov...
2013-04-12 Amith YamasaniMerge "Embed the app restrictions fragment in the dual...
2013-04-12 Irfan SheriffMerge "Limit device name length" into jb-mr2-dev
2013-04-11 Benjamin PoieszMerge "Forcing the settings apk to be built with the...
2013-04-11 Benjamin PoieszForcing the settings apk to be built with the zz_ZZ...
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-12 Daniel SandlerMerge "Show new and old notifications in the same list...
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-07 Daniel SandlerMerge "Listen for the current user's notifications...
2013-03-07 Baligh UddinMerge "Import translations. DO NOT MERGE" into jb-mr2-dev
2013-03-06 Jeff SharkeyMerge "Remove guava dependency to speed up build."...
2013-03-06 Jeff SharkeyRemove guava dependency to speed up build.
2013-03-05 Irfan Sheriffam ba6a68c8: Merge "Fix not updating error message...
2013-02-21 Wink Savilleam a7d2fd80: Merge "avoid stopping app in case of acces...
2013-02-20 Amith Yamasaniam a5f756c9: Merge "Prevent cursor from causing global...
2013-02-16 Irfan Sheriffam ff5b96fb: Merge changes If41fad5f,I9c860569,I2e3e8d4...
2013-02-15 Amith Yamasaniam 1ef6a106: Merge "Fix Settings app crash after enable...
2013-02-14 Kenny Rootresolved conflicts for merge of bbe409d3 to master
2013-02-06 Irfan Sheriffam 5c879e48: am 414d9e9c: Merge "P2PSetting:Avoid p2p_f...
2013-02-06 Irfan Sheriffam 6639dee4: am 203631b2: Merge "wifiSettings: Updating...
2013-01-28 Irfan SheriffMerge "Follow UX design guideline for frequency band"
2013-01-26 Dianne Hackbornam bbf8daf4: am 505232be: Merge "Fix of Settings applic...
2013-01-26 Irfan Sheriffam 61b0f8c8: am b1ea6805: Merge "Option "None" replaced...
2013-01-23 Amith Yamasaniam a6c51f3d: am 7b8b6618: Merge "Fix for battery temper...
2013-01-22 Irfan Sheriffam 814db19c: am 67995f97: Merge "Fix for F/C in WifiCon...
2013-01-22 Elliott Hughesam d7d5b33b: am 375b6d98: Merge "Force closed at settin...
2013-01-19 Irfan SheriffMerge "Allow only valid EAP configs"
2013-01-17 Chris CraikMerge "Remove now obsolete tracing options"
2013-01-17 Russell BrennerMerge "Stop hijacking strings from Setup Wizard"
2013-01-17 Russell BrennerMerge "Revised text for skipping wifi"
2013-01-17 Fabrice Di MeglioMerge "Fix Switches padding for Settings app"
2013-01-16 Amith YamasaniMerge "Use bindServiceAsUser() to follow API change."
2013-01-16 Dianne HackbornQuick and dirty UI for viewing app op information.
2012-12-08 Elliott HughesMerge "Makes the add button for new APNs appear in...
2012-11-01 Amith Yamasaniam f9a2f324: Merge "Changed the way that date format...
2012-09-14 Michael JurkaMerge "Adding ability to filter for certain types of...
2012-09-13 Jeff Sharkeyam 7786df05: am 4a095381: Merge "Iteration on multi...
2012-09-13 Dianne HackbornMerge "Multi-user battery settings." into jb-mr1-dev
2012-09-13 The Android Automergermerge in jb-mr1-release history after reset to jb-mr1-dev
2012-09-13 Jeff Sharkeyam 4a095381: Merge "Iteration on multi-user Storage...
2012-09-13 Jeff Sharkeyam 4a095381: Merge "Iteration on multi-user Storage...
2012-09-13 Jeff SharkeyMerge "Iteration on multi-user Storage UI." into jb...
2012-09-13 Jeff SharkeyIteration on multi-user Storage UI.
2012-09-06 The Android Open... Reconcile with jb-release - do not merge
2012-08-17 The Android Open... Reconcile with jb-mr0-release - do not merge
2012-08-15 Baligh Uddinam 11665038: Merge "Import translations. DO NOT MERGE...
2012-08-14 Baligh Uddinam cb5624b8: Merge "Import translations. DO NOT MERGE...
2012-08-14 Baligh Uddinam c5acc132: Import translations. DO NOT MERGE
2012-08-13 Jean-Baptiste QueruMerge "Settings: Use ICS alert drawable"
2012-08-07 The Android Open... Reconcile with jb-mr0-release - do not merge
2012-08-03 Ying Wangam 3eee86b8: Import translations. DO NOT MERGE
2012-08-03 Michael Jurkaam ca511a81: Fix appwidget bind dialog
2012-08-01 Ying Wangam d7ae05db: Import translations. DO NOT MERGE
2012-08-01 Justin Koham 7b065464: Move BT settings appliance check after...
2012-07-31 The Android Open... Reconcile with jb-mr0-release - do not merge
2012-07-30 Ying Wangam 723bdf1e: Import translations. DO NOT MERGE
2012-07-30 The Android Open... Reconcile with jb-mr0-release jb-release
2012-07-27 Ying Wangam eaeb8b61: Import translations. DO NOT MERGE
2012-07-26 Amith Yamasaniam 07841668: Merge "Move Google-apps specific location...
2012-07-26 Ying Wangam 4e53a0cb: Import translations. DO NOT MERGE
2012-07-25 Ying Wangam c31f6b23: Import translations. DO NOT MERGE
2012-07-25 Ying Wangam 54199540: Import translations. DO NOT MERGE
2012-07-24 Amith Yamasaniam 4635ec6b: Strings for upcoming location settings...
2012-07-23 Ying Wangam 13be5469: Import translations. DO NOT MERGE
2012-07-20 Ying Wangam 509cfa1d: Import translations. DO NOT MERGE
2012-07-19 Ying Wangam 35e404c8: Import translations. DO NOT MERGE
2012-07-19 The Android Open... Reconcile with jb-mr0-release jb-release
2012-07-19 Ying Wangam 2bc05a27: Import translations. DO NOT MERGE
2012-07-17 Ying Wangam fa0f3fe1: Import translations. DO NOT MERGE
2012-07-17 Wink SavilleUse telephony-common - DO NOT MERGE
2012-07-16 Ying Wangam 66daca6b: Import translations. DO NOT MERGE
2012-07-14 Dianne Hackbornam ea819b07: Merge "Implement issue #6819955: Add butto...
2012-07-13 Ying Wangam 4b25c5ad: Import translations. DO NOT MERGE
2012-07-12 Dianne HackbornMerge "If external storage is emulated, don't show...
2012-07-12 Ying Wangam 62acae4f: Merge "Import translations. DO NOT MERGE...
2012-07-12 John Wangam b0b45c02: Display FCC id for LTE in Settings.
2012-07-12 Wink SavilleMerge commit '5543404a' into mit
2012-07-11 Wink SavilleUse telephony-common
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...
next