OSDN Git Service
(root)
/
android-x86
/
packages-apps-Settings.git
/ history
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
first
⋅
prev
⋅
next
Merge "Import translations. DO NOT MERGE" into mnc-dr-dev
[android-x86/packages-apps-Settings.git]
/
proguard.flags
2013-08-15
Robert Greenwalt
am a1fa7cef: am 1faefa06: Merge "Fix one NPE in tetheri...
blob
|
commitdiff
|
diff to current
2013-08-13
Baligh Uddin
am 508997ad: (-s ours) am 728da455: (-s ours) am 03ae9b...
blob
|
commitdiff
|
diff to current
2013-08-13
Baligh Uddin
am 08f1d439: (-s ours) am 05404105: (-s ours) Import...
blob
|
commitdiff
|
diff to current
2013-08-08
Baligh Uddin
am 7256942b: (-s ours) am d01ca3ce: (-s ours) Merge...
blob
|
commitdiff
|
diff to current
2013-08-08
The Android Open...
am f4316f6d: (-s ours) Reconcile with jb-mr2-release...
blob
|
commitdiff
|
diff to current
2013-08-08
Baligh Uddin
am b4d720f9: (-s ours) am 9a53339d: (-s ours) am e211fd...
blob
|
commitdiff
|
diff to current
2013-08-08
Baligh Uddin
am 7256942b: (-s ours) am d01ca3ce: (-s ours) Merge...
blob
|
commitdiff
|
diff to current
2013-08-08
The Android Open...
am f4316f6d: (-s ours) Reconcile with jb-mr2-release...
blob
|
commitdiff
|
diff to current
2013-08-08
Baligh Uddin
am b4d720f9: (-s ours) am 9a53339d: (-s ours) am e211fd...
blob
|
commitdiff
|
diff to current
2013-08-08
Lifu Tang
Merge "Finished the location settings"
blob
|
commitdiff
|
diff to current
2013-08-07
Jason Monk
Merge "Restriction pin changes."
blob
|
commitdiff
|
diff to current
2013-08-07
Baligh Uddin
Merge "Import translations. DO NOT MERGE"
blob
|
commitdiff
|
diff to current
2013-08-07
The Android Automerger
merge in klp-release history after reset to master
blob
|
commitdiff
|
diff to current
2013-08-07
Martijn Coenen
Merge "NFC payment settings."
blob
|
commitdiff
|
diff to current
2013-08-07
Martijn Coenen
NFC payment settings.
blob
|
commitdiff
|
diff to current
2013-07-19
Robert Greenwalt
resolved conflicts for merge of 4d9f670b to stage-aosp...
blob
|
commitdiff
|
diff to current
2013-06-28
Robert Greenwalt
am a1454529: Merge "Dont enable Wi-Fi if it\'s not...
blob
|
commitdiff
|
diff to current
2013-06-27
Elliott Hughes
am 5f6e4339: Merge "Use SimpleDateFormat for time zone...
blob
|
commitdiff
|
diff to current
2013-06-25
Elliott Hughes
am 02e23fb0: Merge "Clamp date setting for the SetupWiz...
blob
|
commitdiff
|
diff to current
2013-06-06
Alex Klyubin
resolved conflicts for merge of 5d21820a to jb-mr2-dev
blob
|
commitdiff
|
diff to current
2013-06-06
Alex Klyubin
am 5aa3f878: (-s ours) am 0c32da7e: am 6f28e342: am...
blob
|
commitdiff
|
diff to current
2013-06-06
Dianne Hackborn
am 9cd1d5e2: (-s ours) am a9a28d2f: am f96a86c9: am...
blob
|
commitdiff
|
diff to current
2013-05-30
Jean-Baptiste Queru
Ignore 81476405 from AOSP
blob
|
commitdiff
|
diff to current
2013-05-21
Amith Yamasani
am 4abe488a: Merge "No back icon in action bar of APN...
blob
|
commitdiff
|
diff to current
2013-04-30
Kenny Root
resolved conflicts for merge of 3c10f535 to jb-mr2...
blob
|
commitdiff
|
diff to current
2013-04-27
Kenny Root
am c814271f: Merge "Fix Clear Credentials item"
blob
|
commitdiff
|
diff to current
2013-04-16
Amith Yamasani
am c1e3983b: Merge "Fix NullPointerException at Running...
blob
|
commitdiff
|
diff to current
2013-04-16
Amith Yamasani
am 91b5fab9: Merge "Check if the Activity is finishing...
blob
|
commitdiff
|
diff to current
2013-04-08
Kenny Root
resolved conflicts for merge of 3a271718 to jb-mr2...
blob
|
commitdiff
|
diff to current
2013-03-29
Kenny Root
am 43366b2c: Merge "Add KeyStore storage type to Settin...
blob
|
commitdiff
|
diff to current
2013-03-28
Kenny Root
am 0d52fc18: am 9dc478ec: Merge "Add ability to install...
blob
|
commitdiff
|
diff to current
2013-03-20
Jeff Sharkey
am f8db32d8: am 74fd506b: Merge "Enable Ethernet tab...
blob
|
commitdiff
|
diff to current
2013-03-17
Robert Greenwalt
am cd1c38cf: am ae9ebfd1: Merge "add MVNO field for...
blob
|
commitdiff
|
diff to current
2013-03-14
Elliott Hughes
am 93692c36: am 53309365: Merge "use date from 1970...
blob
|
commitdiff
|
diff to current
2013-03-12
Amith Yamasani
am 8749f35f: am 506b68e1: Merge "Moved KEY_VIBRATE...
blob
|
commitdiff
|
diff to current
2013-03-11
Jean-Baptiste Queru
am 565af383: am 33adccd2: am 9cff5e3f: am f4b1aefb...
blob
|
commitdiff
|
diff to current
2013-03-08
Amith Yamasani
am 6e0bff0d: Merge "Fix the message when Bluetooth...
blob
|
commitdiff
|
diff to current
2013-03-05
Irfan Sheriff
am ba6a68c8: Merge "Fix not updating error message...
blob
|
commitdiff
|
diff to current
2013-02-22
Baligh Uddin
Merge "Import translations. DO NOT MERGE"
blob
|
commitdiff
|
diff to current
2013-02-22
Irfan Sheriff
Merge "Clean up scan handling"
blob
|
commitdiff
|
diff to current
2013-02-22
Daniel Sandler
Merge "Proguard fix: include notification settings...
blob
|
commitdiff
|
diff to current
2013-02-22
Daniel Sandler
Proguard fix: include notification settings fragment.
blob
|
commitdiff
|
diff to current
2012-08-13
Jean-Baptiste Queru
Merge "Settings: Use ICS alert drawable"
blob
|
commitdiff
|
diff to current
2012-08-01
Justin Koh
am 7b065464: Move BT settings appliance check after...
blob
|
commitdiff
|
diff to current
2012-07-03
Irfan Sheriff
am 2fad853b: Merge "Limit length of SSID input string...
blob
|
commitdiff
|
diff to current
2012-07-03
Irfan Sheriff
am d80ff0a4: Merge "wifi: update text displayed during...
blob
|
commitdiff
|
diff to current
2012-06-14
Jean-Baptiste Queru
am 60ec22d1: (-s ours) Merge "Settings: Fixed German...
blob
|
commitdiff
|
diff to current
2012-06-12
Jean-Baptiste Queru
resolved conflicts for merge of 051f46d7 to jb-dev...
blob
|
commitdiff
|
diff to current
2012-06-11
Jean-Baptiste Queru
am c56b0146: Merge "Fixing pin_too_short text"
blob
|
commitdiff
|
diff to current
2012-06-08
Jean-Baptiste Queru
am 5a0b3230: Merge "Add account type check for invisibl...
blob
|
commitdiff
|
diff to current
2012-05-25
Amith Yamasani
am 8ad7abbc: Merge "Corrected return value for updatePr...
blob
|
commitdiff
|
diff to current
2012-05-22
Jean-Baptiste Queru
am 1a47dff3: Merge "Remove title bar background drawabl...
blob
|
commitdiff
|
diff to current
2012-05-21
Jean-Baptiste Queru
am c0653a12: Merge "Expandable NumberPicker width in...
blob
|
commitdiff
|
diff to current
2012-05-04
Wink Saville
am 69801b36: Merge "RadioInfo: Update the network type...
blob
|
commitdiff
|
diff to current
2012-05-03
Amith Yamasani
am b3c17c57: Merge "Removing static reference from...
blob
|
commitdiff
|
diff to current
2012-05-01
Jean-Baptiste Queru
am 299ed152: (-s ours) Merge "Wifi: Update message...
blob
|
commitdiff
|
diff to current
2012-05-01
Justin Koh
am 519dda9c: Disables BluetoothPairingDialog if in...
blob
|
commitdiff
|
diff to current
2012-05-01
Jean-Baptiste Queru
am 7bb1c807: Merge "Settings: PT-BR translation fix"
blob
|
commitdiff
|
diff to current
2012-04-14
Eric Fischer
am dad12ddb: (-s ours) am 6ce339f6: Import translations...
blob
|
commitdiff
|
diff to current
2012-04-14
Eric Fischer
am ee365b41: (-s ours) Import translations. DO NOT...
blob
|
commitdiff
|
diff to current
2012-04-10
Eric Fischer
am 13741f2f: (-s ours) Import translations. DO NOT...
blob
|
commitdiff
|
diff to current
2012-04-05
Eric Fischer
am a3b3f7e8: (-s ours) am d52d02bf: Import translations...
blob
|
commitdiff
|
diff to current
2012-03-31
Eric Fischer
am 5797c502: (-s ours) am ca0d6822: Import translations...
blob
|
commitdiff
|
diff to current
2012-03-30
Eric Fischer
am f8512644: (-s ours) am 841ad7ba: Import translations...
blob
|
commitdiff
|
diff to current
2012-03-29
Irfan Sheriff
Merge "Fix discovery state tracking"
blob
|
commitdiff
|
diff to current
2012-03-28
The Android Automerger
merge in jb-release history after reset to master
blob
|
commitdiff
|
diff to current
2012-03-28
Kenny Root
Merge "Convert to new KeyStore format"
blob
|
commitdiff
|
diff to current
2012-03-28
Kenny Root
Merge "Update Wifi to use new keystore function"
blob
|
commitdiff
|
diff to current
2012-03-28
Kenny Root
Merge "Switch VPN to use keystore ENGINE"
blob
|
commitdiff
|
diff to current
2012-03-27
Eric Fischer
am fe8b3e9a: (-s ours) am f4ce8c93: Import translations...
blob
|
commitdiff
|
diff to current
2012-03-27
Eric Fischer
Merge "Import translations. DO NOT MERGE"
blob
|
commitdiff
|
diff to current
2012-03-27
Amith Yamasani
Merge "User management screens"
blob
|
commitdiff
|
diff to current
2012-03-27
Amith Yamasani
User management screens
blob
|
commitdiff
|
diff to current
2012-03-27
Eric Fischer
am 819c7192: (-s ours) am c51c5310: Import translations...
blob
|
commitdiff
|
diff to current
2012-03-27
Eric Fischer
am 412daa41: (-s ours) am f8b96014: Import translations...
blob
|
commitdiff
|
diff to current
2012-03-21
Mike Lockwood
Merge remote-tracking branch 'goog/ics-aah-exp'
blob
|
commitdiff
|
diff to current
2012-03-21
Mike Lockwood
Merge commit '50339f3'
blob
|
commitdiff
|
diff to current
2012-03-21
Mike Lockwood
Merge commit '3c7aec3'
blob
|
commitdiff
|
diff to current
2012-03-21
Eric Fischer
am 3ad5cadc: (-s ours) am 6db7e9e0: Import translations...
blob
|
commitdiff
|
diff to current
2012-03-21
Eric Fischer
am 2c95ab5e: (-s ours) am 5665cda1: Import translations...
blob
|
commitdiff
|
diff to current
2012-03-21
Eric Fischer
am b22dff48: (-s ours) am 63cad3dd: Import translations...
blob
|
commitdiff
|
diff to current
2012-03-21
Jason Chen
am 3f49e65f: (-s ours) am b0362b1b: am d5f7e6cd: [DO...
blob
|
commitdiff
|
diff to current
2012-03-21
Jason Chen
am 9b06ca94: (-s ours) am 8f393645: am d5f7e6cd: [DO...
blob
|
commitdiff
|
diff to current
2012-03-21
Jason Chen
am 3180a46c: am 0eb3a3fc: am 23d0b528: Update string...
blob
|
commitdiff
|
diff to current
2012-03-21
Jason Chen
am bb4133b1: am dd6c0d61: am 23d0b528: Update string...
blob
|
commitdiff
|
diff to current
2012-03-02
Irfan Sheriff
am f91e52c9: am c4bf8cd9: am 2f76aaaf: Merge "Enable...
blob
|
commitdiff
|
diff to current
2012-03-02
The Android Open...
am 9ae0b5a2: am b2a0ea35: Reconcile with ics-mr1-release
blob
|
commitdiff
|
diff to current
2012-03-01
The Android Open...
am 224fee2e: am 79ec613a: Reconcile with ics-mr1-release
blob
|
commitdiff
|
diff to current
2012-02-28
Amith Yamasani
am 1d424251: (-s ours) am 9220d367: am 93724840: Don...
blob
|
commitdiff
|
diff to current
2012-02-28
Amith Yamasani
am 35fc9c76: (-s ours) am e5cb62f5: am 93724840: Don...
blob
|
commitdiff
|
diff to current
2012-02-16
The Android Open...
am 6cffd425: am cff569f1: Reconcile with ics-mr1-release
blob
|
commitdiff
|
diff to current
2012-02-16
The Android Open...
am cca3be2b: am 7b276302: Reconcile with ics-mr1-release
blob
|
commitdiff
|
diff to current
2012-02-10
Eric Fischer
am 41e16eaa: (-s ours) am 8b24b374: am 78ef5443: Import...
blob
|
commitdiff
|
diff to current
2012-02-10
Eric Fischer
am 10d7fe69: (-s ours) am ecd9c570: (-s ours) am 78ef54...
blob
|
commitdiff
|
diff to current
2012-02-06
Eric Fischer
am b0d203c3: (-s ours) am 4bec429d: Import translations...
blob
|
commitdiff
|
diff to current
2012-02-03
Eric Fischer
am f215bfff: (-s ours) am 117bfe86: Import translations...
blob
|
commitdiff
|
diff to current
2012-02-02
Eric Fischer
am 175f4154: (-s ours) resolved conflicts for merge...
blob
|
commitdiff
|
diff to current
2012-02-02
Eric Fischer
am 201a77ea: (-s ours) am 940f2a74: (-s ours) am 67a50f...
blob
|
commitdiff
|
diff to current
2012-02-02
Eric Fischer
am c61223ce: (-s ours) am cd92dd07: Import translations...
blob
|
commitdiff
|
diff to current
2012-02-01
The Android Open...
am 84beed8a: am e3e777f7: Reconcile with ics-mr1-release
blob
|
commitdiff
|
diff to current
next
OSDN Git Service
