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
resolved conflicts for merge of 6c82fe07 to master
[android-x86/packages-apps-Settings.git]
/
tests
/
res
/
2011-06-03
Amith Yamasani
resolved conflicts for merge of 6c82fe07 to master
tree
|
commitdiff
2011-06-02
Amith Yamasani
am be6cb943: am 9ef2713f: am 1f7014a2: Merge "Reduce...
tree
|
commitdiff
2011-06-02
Gilles Debunne
am b667422c: am 41a99004: am 53872769: Merge "Erase...
tree
|
commitdiff
2011-06-02
Eric Fischer
am 3518cdf9: (-s ours) am c3786952: am beee8290: Merge...
tree
|
commitdiff
2011-06-01
Dianne Hackborn
am c837756d: am b4799fc9: am aef746c4: Implement new...
tree
|
commitdiff
2011-06-01
Freeman Ng
am f0fae7f2: am 6356b17a: am d671182d: Merge "make...
tree
|
commitdiff
2011-05-31
Adam Powell
am 7d4e88b3: am 57218b5a: am 3c110e50: Fix account...
tree
|
commitdiff
2011-05-31
Jim Miller
am c78f8769: am fbc72cd6: am fd8f7f12: Merge "Fix 44624...
tree
|
commitdiff
2011-05-27
Daniel Sandler
Merge "Dream (screensaver) settings."
tree
|
commitdiff
2011-05-26
Eric Fischer
Merge "Import revised translations."
tree
|
commitdiff
2011-05-26
Eric Fischer
Import revised translations.
tree
|
commitdiff
2011-05-20
The Android Open...
Reconcile with gingerbread-release honeycomb-release
tree
|
commitdiff
2011-04-28
Eric Fischer
am 643e48b7: (-s ours) am 7c284c2c: Import revised...
tree
|
commitdiff
2011-04-27
Eric Fischer
am 7c284c2c: Import revised translations. DO NOT MERGE
tree
|
commitdiff
2011-04-27
Conley Owens
Ignoring empty list test in favor of commented out...
tree
|
commitdiff
2011-04-12
Simon Wilson
am f927cccd: (-s ours) am 37063d6a: DO NOT MERGE Clarif...
tree
|
commitdiff
2011-04-11
Eric Fischer
am 84c90053: (-s ours) am fcb089c9: Merge "Reimport...
tree
|
commitdiff
2011-04-11
Simon Wilson
am 2ca7add5: (-s ours) am ca572fb6: Merge "DO NOT MERGE...
tree
|
commitdiff
2011-04-11
Eric Fischer
am 6735ae14: (-s ours) am b4bd78f5: Revert "Import...
tree
|
commitdiff
2011-04-11
Simon Wilson
am 37063d6a: DO NOT MERGE Clarify additional system...
tree
|
commitdiff
2011-04-05
Eric Fischer
am dfb78827: (-s ours) am 955ab98f: Import revised...
tree
|
commitdiff
2011-04-04
Eric Fischer
am fcb089c9: Merge "Reimport Settings translations...
tree
|
commitdiff
2011-04-04
Simon Wilson
am ca572fb6: Merge "DO NOT MERGE Put additional update...
tree
|
commitdiff
2011-04-04
Eric Fischer
am b4bd78f5: Revert "Import revised translations. ...
tree
|
commitdiff
2011-04-04
Eric Fischer
am 955ab98f: Import revised translations. DO NOT MERGE
tree
|
commitdiff
2011-03-30
Park Sanghyun
am 2b2959b3: (-s ours) am e5da8565: DO NOT MERGE Add...
tree
|
commitdiff
2011-03-30
Kenny Root
resolved conflicts for merge of 70a1ff03 to honeycomb...
tree
|
commitdiff
2011-03-30
Park Sanghyun
am e5da8565: DO NOT MERGE Add support for additional...
tree
|
commitdiff
2011-03-18
Eric Fischer
am 9567622d: (-s ours) am c4eeeb29: Import revised...
tree
|
commitdiff
2011-03-18
Eric Fischer
am c4eeeb29: Import revised translations. DO NOT MERGE
tree
|
commitdiff
2011-03-17
TK MUN
am 8c2a02de: (-s ours) am e0e845fe: DO NOT MERGE Do...
tree
|
commitdiff
2011-03-17
TK MUN
am e0e845fe: DO NOT MERGE Do not allow shortcut for...
tree
|
commitdiff
2011-03-15
Mike Lockwood
am 61487da6: (-s ours) am e6c7e45f: DO NOT MERGE: IUsbM...
tree
|
commitdiff
2011-03-14
Mike Lockwood
am e6c7e45f: DO NOT MERGE: IUsbManager hasDefaults...
tree
|
commitdiff
2011-03-10
TK MUN
am f018bd8c: (-s ours) am 36469186: DO NOT MERGE WiMAX...
tree
|
commitdiff
2011-03-10
TK MUN
am 36469186: DO NOT MERGE WiMAX settings menu
tree
|
commitdiff
2011-03-04
Lorenzo Colitti
resolved conflicts for merge of a4fb8c86 to honeycomb...
tree
|
commitdiff
2011-03-04
Lorenzo Colitti
am f4393101: Merge "Support configuring the protocol...
tree
|
commitdiff
2011-03-03
Mike Lockwood
am 9d768735: (-s ours) am 0552d336: DO NOT MERGE: Insta...
tree
|
commitdiff
2011-03-02
Mike Lockwood
am 0552d336: DO NOT MERGE: InstalledAppDetails: "Clear...
tree
|
commitdiff
2011-02-22
Eric Fischer
am 058f62ba: (-s ours) am bd044818: Import revised...
tree
|
commitdiff
2011-02-18
Eric Fischer
am bd044818: Import revised translations. DO NOT MERGE
tree
|
commitdiff
2011-02-18
Wink Saville
Merge "Changes for ril.h version 6."
tree
|
commitdiff
2011-02-17
Irfan Sheriff
Merge "Add support for WPA for soft Ap"
tree
|
commitdiff
2011-02-17
Eric Fischer
Import revised translations.
tree
|
commitdiff
2011-02-16
Eric Fischer
am afdbc0d9: (-s ours) am 2279d3e1: Import revised...
tree
|
commitdiff
2011-02-11
Amith Yamasani
am 5dd5aff8: (-s ours) am 255fa0e9: (-s ours) am aae04e...
tree
|
commitdiff
2011-02-11
Amith Yamasani
am 255fa0e9: (-s ours) am aae04e43: Prevent monkeys...
tree
|
commitdiff
2011-02-11
Amith Yamasani
am aae04e43: Prevent monkeys from USB tethering. It...
tree
|
commitdiff
2011-02-10
Eric Fischer
am 551a9876: (-s ours) am d422079a: (-s ours) am 47d2ec...
tree
|
commitdiff
2011-02-10
Eric Fischer
am d422079a: (-s ours) am 47d2ecd0: Import revised...
tree
|
commitdiff
2011-02-09
Eric Fischer
am 2cf42dfb: (-s ours) am c5d5334e: Import revised...
tree
|
commitdiff
2011-02-09
Eric Fischer
am 47d2ecd0: Import revised translations. DO NOT MERGE
tree
|
commitdiff
2011-02-08
Eric Fischer
Import revised translations. DO NOT MERGE
tree
|
commitdiff
2011-02-08
Eric Fischer
am f0c435c6: (-s ours) am 805b5add: Import revised...
tree
|
commitdiff
2011-02-08
Eric Fischer
am 805b5add: Import revised translations. DO NOT MERGE
tree
|
commitdiff
2011-02-08
Eric Fischer
Import revised translations. DO NOT MERGE
tree
|
commitdiff
2011-02-07
Eric Fischer
Import revised translations. DO NOT MERGE
tree
|
commitdiff
2011-02-05
Jake Hamby
am 47cb1753: (-s ours) am 1798fc04: Merge "Fixed a...
tree
|
commitdiff
2011-02-05
Jake Hamby
am 1798fc04: Merge "Fixed a memory leak in the bluetoot...
tree
|
commitdiff
2011-02-01
Eric Fischer
am 2b78f433: (-s ours) am 93580e22: Import revised...
tree
|
commitdiff
2011-02-01
Eric Fischer
am 93580e22: Import revised translations. DO NOT MERGE
tree
|
commitdiff
2011-01-29
Eric Fischer
am 5a2bb8c0: (-s ours) Import revised translations...
tree
|
commitdiff
2011-01-29
Eric Fischer
am 95112e5b: (-s ours) Import revised translations...
tree
|
commitdiff
2011-01-29
Eric Fischer
am abdfaed8: (-s ours) am 5a2bb8c0: Import revised...
tree
|
commitdiff
2011-01-29
Eric Fischer
am 0cd5e21a: (-s ours) am 95112e5b: Import revised...
tree
|
commitdiff
2011-01-28
Eric Fischer
am 5a2bb8c0: Import revised translations. DO NOT MERGE
tree
|
commitdiff
2011-01-27
Eric Fischer
am 95112e5b: Import revised translations. DO NOT MERGE
tree
|
commitdiff
2011-01-25
Eric Fischer
am 6418d373: (-s ours) Import translations for addition...
tree
|
commitdiff
2011-01-18
Amith Yamasani
am 2768ae05: am f7fd4ca8: Merge "Disable change PIN...
tree
|
commitdiff
2011-01-18
Amith Yamasani
am f7fd4ca8: Merge "Disable change PIN when PIN is...
tree
|
commitdiff
2011-01-08
Eric Fischer
am 40bcf565: (-s ours) am 6418d373: Import translations...
tree
|
commitdiff
2011-01-07
Eric Fischer
am 6418d373: Import translations for additional languages.
tree
|
commitdiff
2011-01-07
The Android Automerger
merge in gingerbread-release history after reset to...
tree
|
commitdiff
2011-01-06
Eric Fischer
Import translations for additional languages.
tree
|
commitdiff
2011-01-06
Jim Miller
Merge "Fix 3315401: Prevent pattern confirmation screen...
tree
|
commitdiff
2011-01-05
Patrick Dubroy
Merge "fix 3185231: Dragging app to info button doesn...
tree
|
commitdiff
2011-01-05
Amith Yamasani
Merge "Recheck the storage sizes when Storage settings...
tree
|
commitdiff
2011-01-05
The Android Automerger
merge in honeycomb-release history after reset to master
tree
|
commitdiff
2011-01-04
Eric Fischer
Merge changes Ia9338cf2,I5ef641b5
tree
|
commitdiff
2010-12-28
Jean-Baptiste Queru
am 9a10fb0b: am e8531ff6: Merge "Changed the text input...
tree
|
commitdiff
2010-12-23
Eric Fischer
Import revised translations.
tree
|
commitdiff
2010-12-13
Nick Pelly
am 934c1b9f: am c1286804: Merge "Update Settings for...
tree
|
commitdiff
2010-12-11
Nick Pelly
am c1286804: Merge "Update Settings for new NfcAdapter...
tree
|
commitdiff
2010-12-10
Eric Fischer
am 5721cb1d: (-s ours) am 99d2471d: Import revised...
tree
|
commitdiff
2010-12-10
Eric Fischer
am 99d2471d: Import revised translations. DO NOT MERGE
tree
|
commitdiff
2010-12-10
Jean-Baptiste Queru
am 9b9c61f6: am 2a7c5425: reconcile with open-source...
tree
|
commitdiff
2010-12-10
Jean-Baptiste Queru
am 2a7c5425: reconcile with open-source gingerbread
tree
|
commitdiff
2010-12-09
Jean-Baptiste Queru
am bd73c736: (-s ours) am 1acfef82: merge from gingerbread
tree
|
commitdiff
2010-12-09
Jean-Baptiste Queru
merge from gingerbread
tree
|
commitdiff
2010-12-06
Jake Hamby
am 90b1f193: (-s ours) am b0fda6f5: Reduce max BT devic...
tree
|
commitdiff
2010-12-05
Jake Hamby
am b0fda6f5: Reduce max BT device length to 246 bytes...
tree
|
commitdiff
2010-12-04
The Android Automerger
Merge branch 'master' into honeycomb-release
tree
|
commitdiff
2010-12-02
Eric Fischer
Rename Indonesian and Hebrew translations to match...
tree
|
commitdiff
2010-12-02
Irfan Sheriff
am ea04ee75: (-s ours) am fa04d89f: avoid view creation...
tree
|
commitdiff
2010-12-01
Irfan Sheriff
am fa04d89f: avoid view creation on orientation change
tree
|
commitdiff
2010-12-01
Eric Fischer
am 39f8dba1: (-s ours) am e1e257f4: Import revised...
tree
|
commitdiff
2010-11-30
Eric Fischer
am e1e257f4: Import revised translations. DO NOT MERGE
tree
|
commitdiff
2010-11-30
Jean-Baptiste Queru
am b68b35dd: am 04b646df: Merge "Possible NumberFormatE...
tree
|
commitdiff
2010-11-24
Gilles Debunne
Merge "Removed unused assets."
tree
|
commitdiff
next