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 "Android OS battery usage overstated by screen on time" into ics-mr1
[android-x86/packages-apps-Settings.git]
/
proguard.flags
2011-09-14
The Android Open...
Reconcile with gingerbread-mr4-release
blob
|
commitdiff
2011-09-09
Jean-Baptiste Queru
Reconcile with gingerbread-release gingerbread-mr4...
blob
|
commitdiff
2011-08-30
Ryan PC Gibson
am 57c88834: (-s ours) am 9fe36302: (-s ours) am 9cb97c...
blob
|
commitdiff
2011-08-30
Ryan PC Gibson
am 9fe36302: (-s ours) am 9cb97c44: Merge "DO NOT MERGE...
blob
|
commitdiff
|
diff to current
2011-08-12
Amith Yamasani
am 7e1c6cc0: am d7d6c7ff: am 34d9b03f: Merge "Fix wrong...
blob
|
commitdiff
2011-08-12
Amith Yamasani
am f14f96ef: am b3f6116e: am fd73824d: Merge "Fix:...
blob
|
commitdiff
2011-08-12
Amith Yamasani
am d7d6c7ff: am 34d9b03f: Merge "Fix wrong behavior...
blob
|
commitdiff
|
diff to current
2011-08-12
Amith Yamasani
am b3f6116e: am fd73824d: Merge "Fix: Text is cut in...
blob
|
commitdiff
|
diff to current
2011-08-05
The Android Open...
Reconcile with gingerbread-release gingerbread-mr4...
blob
|
commitdiff
2011-07-14
Dianne Hackborn
am f70f60c4: am 7d19d795: am b41b85dc: am c74500f4...
blob
|
commitdiff
2011-07-14
John Wang
am 25bd33e1: am d7b2dccb: Display IMEI and ICCID for...
blob
|
commitdiff
2011-07-14
Dianne Hackborn
am 7d19d795: am b41b85dc: am c74500f4: Merge "Fix NPE...
blob
|
commitdiff
|
diff to current
2011-07-01
John Wang
am ab824c81: (-s ours) am f44308a7: Display FCC id...
blob
|
commitdiff
2011-06-30
Dianne Hackborn
Merge "Fix up storage UI for old USB storage."
blob
|
commitdiff
2011-06-30
Amith Yamasani
Merge "Add PowerUsageSummary to proguard list."
blob
|
commitdiff
2011-06-30
Amith Yamasani
Add PowerUsageSummary to proguard list.
blob
|
commitdiff
2011-06-27
Eric Fischer
am 6a078ed3: (-s ours) am a18484fb: Import new translat...
blob
|
commitdiff
|
diff to current
2011-06-24
The Android Open...
Reconcile with gingerbread-release
blob
|
commitdiff
|
diff to current
2011-06-21
Jaikumar Ganesh
am 38ae9125: (-s ours) am 7ab66973: Merge "DO NOT MERGE...
blob
|
commitdiff
|
diff to current
2011-06-20
Jaikumar Ganesh
am a7bb204a: am c6f14410: Merge "Remove CHAR LIMIT...
blob
|
commitdiff
|
diff to current
2011-06-20
Jaikumar Ganesh
am f3670df2: am 2c85966d: Merge "New strings for Blueto...
blob
|
commitdiff
|
diff to current
2011-06-16
Eric Fischer
am 3c75fbc5: (-s ours) am 5bdc3e91: Import revised...
blob
|
commitdiff
|
diff to current
2011-06-09
Jean-Baptiste Queru
Reconcile with gingerbread-release
blob
|
commitdiff
|
diff to current
2011-06-07
Jaikumar Ganesh
am a6daa21d: (-s ours) am 015788ca: Merge "Import trans...
blob
|
commitdiff
|
diff to current
2011-06-07
Jaikumar Ganesh
am bd34e568: (-s ours) am eddb21a2: Merge "Changes...
blob
|
commitdiff
|
diff to current
2011-06-07
Jaikumar Ganesh
am aeca1851: (-s ours) am c955d8ee: Merge "Allow users...
blob
|
commitdiff
|
diff to current
2011-06-06
Marco Nelissen
resolved conflicts for merge of 531bed61 to honeycomb...
blob
|
commitdiff
|
diff to current
2011-05-20
The Android Open...
Reconcile with gingerbread-release honeycomb-release
blob
|
commitdiff
|
diff to current
2011-04-28
Eric Fischer
am 643e48b7: (-s ours) am 7c284c2c: Import revised...
blob
|
commitdiff
|
diff to current
2011-04-27
Conley Owens
Ignoring empty list test in favor of commented out...
blob
|
commitdiff
|
diff to current
2011-04-12
Simon Wilson
am f927cccd: (-s ours) am 37063d6a: DO NOT MERGE Clarif...
blob
|
commitdiff
|
diff to current
2011-04-11
Eric Fischer
am 84c90053: (-s ours) am fcb089c9: Merge "Reimport...
blob
|
commitdiff
|
diff to current
2011-04-11
Simon Wilson
am 2ca7add5: (-s ours) am ca572fb6: Merge "DO NOT MERGE...
blob
|
commitdiff
|
diff to current
2011-04-11
Eric Fischer
am 6735ae14: (-s ours) am b4bd78f5: Revert "Import...
blob
|
commitdiff
|
diff to current
2011-04-05
Eric Fischer
am dfb78827: (-s ours) am 955ab98f: Import revised...
blob
|
commitdiff
|
diff to current
2011-03-30
Park Sanghyun
am 2b2959b3: (-s ours) am e5da8565: DO NOT MERGE Add...
blob
|
commitdiff
|
diff to current
2011-03-30
Kenny Root
resolved conflicts for merge of 70a1ff03 to honeycomb...
blob
|
commitdiff
|
diff to current
2011-03-18
Eric Fischer
am 9567622d: (-s ours) am c4eeeb29: Import revised...
blob
|
commitdiff
|
diff to current
2011-03-17
TK MUN
am 8c2a02de: (-s ours) am e0e845fe: DO NOT MERGE Do...
blob
|
commitdiff
|
diff to current
2011-03-15
Mike Lockwood
am 61487da6: (-s ours) am e6c7e45f: DO NOT MERGE: IUsbM...
blob
|
commitdiff
|
diff to current
2011-03-10
TK MUN
am f018bd8c: (-s ours) am 36469186: DO NOT MERGE WiMAX...
blob
|
commitdiff
|
diff to current
2011-03-04
Lorenzo Colitti
resolved conflicts for merge of a4fb8c86 to honeycomb...
blob
|
commitdiff
|
diff to current
2011-03-03
Mike Lockwood
am 9d768735: (-s ours) am 0552d336: DO NOT MERGE: Insta...
blob
|
commitdiff
|
diff to current
2011-02-22
Eric Fischer
am 058f62ba: (-s ours) am bd044818: Import revised...
blob
|
commitdiff
|
diff to current
2011-02-11
Amith Yamasani
am 255fa0e9: (-s ours) am aae04e43: Prevent monkeys...
blob
|
commitdiff
|
diff to current
2011-02-10
Eric Fischer
am d422079a: (-s ours) am 47d2ecd0: Import revised...
blob
|
commitdiff
|
diff to current
2011-02-05
Jake Hamby
am 47cb1753: (-s ours) am 1798fc04: Merge "Fixed a...
blob
|
commitdiff
|
diff to current
2011-02-01
Eric Fischer
am 2b78f433: (-s ours) am 93580e22: Import revised...
blob
|
commitdiff
|
diff to current
2011-01-29
Eric Fischer
am 5a2bb8c0: (-s ours) Import revised translations...
blob
|
commitdiff
|
diff to current
2011-01-29
Eric Fischer
am 95112e5b: (-s ours) Import revised translations...
blob
|
commitdiff
|
diff to current
2011-01-29
Eric Fischer
am abdfaed8: (-s ours) am 5a2bb8c0: Import revised...
blob
|
commitdiff
|
diff to current
2011-01-29
Eric Fischer
am 0cd5e21a: (-s ours) am 95112e5b: Import revised...
blob
|
commitdiff
|
diff to current
2011-01-25
Eric Fischer
am 6418d373: (-s ours) Import translations for addition...
blob
|
commitdiff
|
diff to current
2011-01-18
Amith Yamasani
am 2768ae05: am f7fd4ca8: Merge "Disable change PIN...
blob
|
commitdiff
|
diff to current
2011-01-08
Eric Fischer
am 40bcf565: (-s ours) am 6418d373: Import translations...
blob
|
commitdiff
|
diff to current
2010-12-28
Jean-Baptiste Queru
am 9a10fb0b: am e8531ff6: Merge "Changed the text input...
blob
|
commitdiff
|
diff to current
2010-12-13
Nick Pelly
am 934c1b9f: am c1286804: Merge "Update Settings for...
blob
|
commitdiff
|
diff to current
2010-12-10
Eric Fischer
am 5721cb1d: (-s ours) am 99d2471d: Import revised...
blob
|
commitdiff
|
diff to current
2010-12-10
Jean-Baptiste Queru
am 9b9c61f6: am 2a7c5425: reconcile with open-source...
blob
|
commitdiff
|
diff to current
2010-12-09
Jean-Baptiste Queru
am bd73c736: (-s ours) am 1acfef82: merge from gingerbread
blob
|
commitdiff
|
diff to current
2010-12-06
Jake Hamby
am 90b1f193: (-s ours) am b0fda6f5: Reduce max BT devic...
blob
|
commitdiff
|
diff to current
2010-12-02
The Android Automerger
Merge branch 'master' into honeycomb-release
blob
|
commitdiff
|
diff to current
2010-12-02
Eric Fischer
Merge "Import revised translations."
blob
|
commitdiff
|
diff to current
2010-12-02
Irfan Sheriff
am ea04ee75: (-s ours) am fa04d89f: avoid view creation...
blob
|
commitdiff
|
diff to current
2010-12-01
Amith Yamasani
Move Account & sync settings into Settings app.
blob
|
commitdiff
|
diff to current
2010-12-01
Eric Fischer
am 39f8dba1: (-s ours) am e1e257f4: Import revised...
blob
|
commitdiff
|
diff to current
2010-11-30
Jean-Baptiste Queru
am b68b35dd: am 04b646df: Merge "Possible NumberFormatE...
blob
|
commitdiff
|
diff to current
2010-11-11
Eric Fischer
am 71d43248: (-s ours) am 5c205262: Merge "Import revis...
blob
|
commitdiff
|
diff to current
2010-11-11
Dianne Hackborn
am 969773aa: am 83d2698f: Merge "Fix issue #3177284...
blob
|
commitdiff
|
diff to current
2010-11-04
Nick Pelly
am b93b018a: am 91ba0709: Update settings text on succe...
blob
|
commitdiff
|
diff to current
2010-11-04
The Android Automerger
Merge branch 'master' into honeycomb-release
blob
|
commitdiff
|
diff to current
2010-11-04
satok
Merge "Reset selected InputMethodSubtype when the check...
blob
|
commitdiff
|
diff to current
2010-11-03
Amith Yamasani
Fragmentize "Factory reset" setting screen.
blob
|
commitdiff
|
diff to current
2010-11-01
The Android Automerger
Merge branch 'master' into honeycomb-release
blob
|
commitdiff
|
diff to current
2010-11-01
satok
Move classes related to input method to com.android...
blob
|
commitdiff
|
diff to current
2010-10-30
Dianne Hackborn
Merge "Start fragmentizing Manage Applications."
blob
|
commitdiff
|
diff to current
2010-10-30
Dianne Hackborn
Start fragmentizing Manage Applications.
blob
|
commitdiff
|
diff to current
2010-10-29
Dianne Hackborn
am 5f301797: am 4e4ed14e: Fix issue #3146784: ANR in...
blob
|
commitdiff
|
diff to current
2010-10-29
The Android Automerger
Merge branch 'master' into honeycomb-release
blob
|
commitdiff
|
diff to current
2010-10-28
Amith Yamasani
Fix proguard flags to retain FindNearby class.
blob
|
commitdiff
|
diff to current
2010-10-26
Jean-Baptiste Queru
am 28539897: am 8815f032: Merge "Always set right auth_...
blob
|
commitdiff
|
diff to current
2010-10-25
Eric Fischer
am c26cfa35: (-s ours) am 873a27c3: Import revised...
blob
|
commitdiff
|
diff to current
2010-10-22
Eric Fischer
am 0b655575: (-s ours) am 901f4fbe: Merge "Import revis...
blob
|
commitdiff
|
diff to current
2010-10-22
Dianne Hackborn
am 8731cb1b: am 5e34f239: Fix issue #3124528: Mange...
blob
|
commitdiff
|
diff to current
2010-10-22
Eric Fischer
resolved conflicts for merge of 92acdba0 to master
blob
|
commitdiff
|
diff to current
2010-10-22
Roy West
am d2927990: (-s ours) am 69827524: Try to fix bug31193...
blob
|
commitdiff
|
diff to current
2010-10-22
Jean-Baptiste Queru
Merge from gingerbread-plus-aosp
blob
|
commitdiff
|
diff to current
2010-10-21
Nick Pelly
am 26d6e470: am 781c0aa2: Merge "NFC Settings cleanup...
blob
|
commitdiff
|
diff to current
2010-10-21
Dianne Hackborn
am 149fec6a: am 7a519955: Merge "Fix issue #3114356...
blob
|
commitdiff
|
diff to current
2010-10-21
Nick Pelly
am 029f23c3: am ff8018dc: Merge "Fix NFC permission...
blob
|
commitdiff
|
diff to current
2010-10-21
Dianne Hackborn
am 5cfa7587: am 916adce0: Fix issue #3108683: GRH18...
blob
|
commitdiff
|
diff to current
2010-10-19
Brad Fitzpatrick
am 4036e768: am d36d650a: NFC: async enabling/disabling...
blob
|
commitdiff
|
diff to current
2010-10-19
Brad Fitzpatrick
am 17001cea: NFC: async enabling/disabling, ala Bluewoo...
blob
|
commitdiff
|
diff to current
2010-10-19
Roy West
resolved conflicts for merge of 98f3aff3 to master
blob
|
commitdiff
|
diff to current
2010-10-18
Dan Morrill
Merge commit 'b7eb8cdad900fc0ddd2d6a7fd79ab7a716c62841...
blob
|
commitdiff
|
diff to current
2010-10-18
Dan Morrill
Merge commit '593a7049f52d46a4e47162e2e3f2c5730e8ccfd8...
blob
|
commitdiff
|
diff to current
2010-10-18
Kenny Root
am ea86bcd1: (-s ours) am 3594b1b7: Import revised...
blob
|
commitdiff
|
diff to current
2010-10-17
Nick Pelly
am fb515337: am e1a9ca68: Merge "Use NfcAdapter.getDefa...
blob
|
commitdiff
|
diff to current
2010-10-16
Amith Yamasani
am 8de45a66: am 1bdb7874: Make summary appear for both...
blob
|
commitdiff
|
diff to current
2010-10-16
Roy West
am d3c1749b: am 2c489973: Change USB tab to USB storage...
blob
|
commitdiff
|
diff to current
next
OSDN Git Service
