OSDN Git Service
(root)
/
android-x86
/
frameworks-base.git
/ history
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
first ⋅ prev ⋅
next
am d66a92e6: am da882181: Merge "Eliminating dead code with no other effect than...
[android-x86/frameworks-base.git]
/
keystore
/
2011-04-29
Conley Owens
am d66a92e6: am da882181: Merge "Eliminating dead code...
tree
|
commitdiff
2011-04-29
Conley Owens
am 893812b2: am e6e3322a: am 8fff7805: Merge "Remove...
tree
|
commitdiff
2011-04-28
Eric Fischer
am 1d104476: (-s ours) am a4e7353d: Import revised...
tree
|
commitdiff
2011-04-28
Conley Owens
Ignore change since file no longer exists
tree
|
commitdiff
2011-04-27
Conley Owens
Merge commit '5e3562a5' into m
tree
|
commitdiff
2011-04-27
Conley Owens
Ignore xml change since file no longer exists
tree
|
commitdiff
2011-04-27
Conley Owens
am ac505b86: am f0556bb9: am 86d1d747: Merge "Add lock...
tree
|
commitdiff
2011-04-27
Conley Owens
am 470239a0: am 30d59fa9: Ignore fix for startup NPE...
tree
|
commitdiff
2011-04-27
Nick Pelly
am 36e6c4c1: am cc9ee72b: Implement dead service recove...
tree
|
commitdiff
2011-04-26
Conley Owens
am 54a952c8: am bf4769c7: am 17ba30b5: Merge "Load...
tree
|
commitdiff
2011-04-26
Kenny Root
am bb93dad9: am bb10986c: am 13ce221e: Merge "libutils...
tree
|
commitdiff
2011-04-26
Jean-Baptiste Queru
am 45e13ec1: am 5fcfce96: am 4b72eec3: Merge "Re-assing...
tree
|
commitdiff
2011-04-26
Irfan Sheriff
am 78d4e71d: (-s ours) am d2127c43: Handle DHCP renewal...
tree
|
commitdiff
2011-04-19
Jaikumar Ganesh
am 24a16e6c: am c34c88b9: am ec1a8f7a: Merge "Unable...
tree
|
commitdiff
2011-04-18
Andreas Huber
am 5ce9eb9a: (-s ours) am f0f1ceeb: DO NOT MERGE: Make...
tree
|
commitdiff
2011-04-12
Eric Fischer
am 68cb0ffa: (-s ours) am 71a556f2: Import revised...
tree
|
commitdiff
2011-04-12
Kenny Root
resolved conflicts for merge of 87b3c0dc to honeycomb...
tree
|
commitdiff
2011-04-12
Brad Fitzpatrick
am 4430670f: am ca7ad44a: Merge "audioflinger: Enable...
tree
|
commitdiff
2011-04-12
Xavier Ducrohet
resolved conflicts for merge of 4754c79a to honeycomb...
tree
|
commitdiff
2011-04-11
Xavier Ducrohet
resolved conflicts for merge of efa98a29 to honeycomb...
tree
|
commitdiff
2011-04-11
Mike Lockwood
am 9645081c: am 43707a83: UsbManager: minor Javadoc...
tree
|
commitdiff
2011-04-11
Jason parks
am 7f506024: am 78a9766b: Merge "Implement teardown...
tree
|
commitdiff
2011-04-11
Jeff Hamilton
am 7bb236c3: am 84d34078: Make the NFC UID forward...
tree
|
commitdiff
2011-04-11
James Dong
am b0ccbacd: (-s ours) am ea5d2c58: Merge "When read...
tree
|
commitdiff
2011-04-05
Eric Laurent
am b7a76e84: am a482d83c: Merge "Issue 4157048: mic...
tree
|
commitdiff
2011-04-05
Mike Lockwood
am 179122ad: (-s ours) am a8731e1e: Merge "DO NOT MERGE...
tree
|
commitdiff
2011-04-05
Trevor Johns
am ea477d20: am cafbe87d: Merge "Fixing line in Market...
tree
|
commitdiff
2011-04-05
Simon Wilson
am d7a8e845: (-s ours) am ec944728: Merge "DO NOT MERGE...
tree
|
commitdiff
2011-04-04
Eric Fischer
am d20023ae: (-s ours) am 8b312c6c: Merge "Import revis...
tree
|
commitdiff
2011-04-04
Jason parks
am 1d733625: am cca2f2f9: Merge "Send out a broadcast...
tree
|
commitdiff
2011-04-04
Justin Ho
am 0f5e36de: am 87805ca3: Updated CDMA roaming icons
tree
|
commitdiff
2011-04-04
Jean-Baptiste Queru
am 0c61e105: am bef31431: No-op - reconcile with open...
tree
|
commitdiff
2011-04-04
Robert Greenwalt
resolved conflicts for merge of ab2194aa to honeycomb...
tree
|
commitdiff
2011-04-04
Robert Greenwalt
am 37229514: Merge "resolved conflicts for merge of...
tree
|
commitdiff
2011-04-04
Brad Fitzpatrick
am 27e00544: am 9907d161: Merge "Fix data corruption...
tree
|
commitdiff
2011-04-04
Brad Fitzpatrick
am 9b1b6439: am 2ed72048: Merge "Always return a valid...
tree
|
commitdiff
2011-04-04
Brad Fitzpatrick
am f7a34b15: am e558a000: Merge "Avoid crash in system...
tree
|
commitdiff
2011-04-04
Robert Greenwalt
resolved conflicts for merge of 92d72ca0 to honeycomb...
tree
|
commitdiff
2011-04-01
Jean-Baptiste Queru
ignore from gingerbread-plus-aosp
tree
|
commitdiff
2011-04-01
Russell Brenner
am 7b445dd7: am 49b49f8f: Added include/private/hwui...
tree
|
commitdiff
2011-03-30
Jeff Hamilton
am b9896794: am 96cf34d3: Merge "Make STOP_APP_SWITCHES...
tree
|
commitdiff
2011-03-30
Irfan Sheriff
am 11ebb6f5: (-s ours) am 05f14e2b: Merge "DO NOT MERGE...
tree
|
commitdiff
2011-03-30
Robert Greenwalt
resolved conflicts for merge of ce6766ea to honeycomb...
tree
|
commitdiff
2011-03-30
The Android Open...
am 5e1383f2: am ad663d80: Merge from gingerbread
tree
|
commitdiff
2011-03-30
Brad Fitzpatrick
am f7a9b869: am 1e7fb7ae: Merge "Error in compound...
tree
|
commitdiff
2011-03-30
Brad Fitzpatrick
am b618b2ef: am f0dbf00d: Merge "Handle OutOfMemoryErro...
tree
|
commitdiff
2011-03-30
Brad Fitzpatrick
am 7a84a60d: am 1a5a2379: Merge "Unregister callback...
tree
|
commitdiff
2011-03-29
Jeff Hamilton
am ad91eee2: am 9c1ef098: Update the value for the...
tree
|
commitdiff
2011-03-29
Bart Sears
am 35137d66: (-s ours) am 6a19759c: Do Not Merge: Cherr...
tree
|
commitdiff
2011-03-29
Huahui Wu
am 772f5bb1: (-s ours) am f440831d: DO NOT MERGE
tree
|
commitdiff
2011-03-29
Brad Fitzpatrick
am 6f67e7bf: am 2e383bc6: Merge "Making it possible...
tree
|
commitdiff
2011-03-29
Brad Fitzpatrick
am a4206029: am 5d5a0ca5: Merge "Fixing the wrong link...
tree
|
commitdiff
2011-03-25
Nick Pelly
am 14923862: am e69f4267: Merge "NfcAdapterExtras:...
tree
|
commitdiff
2011-03-23
Simon Wilson
am 03aa986e: (-s ours) am 1ba4897e: Merge "DO NOT MERGE...
tree
|
commitdiff
2011-03-22
repo sync
resolved conflicts for merge of 17f95e92 to honeycomb...
tree
|
commitdiff
2011-03-21
Mike Lockwood
am 9a612b54: (-s ours) am 65de3c76: DO NOT MERGE: UsbSe...
tree
|
commitdiff
2011-03-18
Eric Fischer
am 9ac82606: (-s ours) am c0604255: Merge "Import revis...
tree
|
commitdiff
2011-03-18
Valentin Kravtsov
am 000466d7: am 125be9c8: Merge "Fixing a race conditio...
tree
|
commitdiff
2011-03-17
Xia Wang
am 01a11148: (-s ours) am e12a1a09: Merge "Port wi...
tree
|
commitdiff
2011-03-17
Xavier Ducrohet
am 3a90ec4e: (-s ours) am c7c8c599: Merge 67450db0...
tree
|
commitdiff
2011-03-17
Mike Lockwood
am a5b68f39: am 5982bf66: GPS: Restore XTRA downloading...
tree
|
commitdiff
2011-03-17
Simon Wilson
am 3fa3721e: (-s ours) am 3f5995da: Merge "DO NOT MERGE...
tree
|
commitdiff
2011-03-17
Mike Lockwood
am af64e751: (-s ours) am 27d9fb57: DO NOT MERGE: ...
tree
|
commitdiff
2011-03-17
Brad Fitzpatrick
am b8332786: am d973bed3: Merge "Removing dead store...
tree
|
commitdiff
2011-03-15
Dianne Hackborn
am e2e8da7c: am 7c2e76f0: Merge "Improve error reportin...
tree
|
commitdiff
2011-03-15
Mike Lockwood
am 3c9aa1aa: (-s ours) am b0976320: Merge "DO NOT MERGE...
tree
|
commitdiff
2011-03-15
Xavier Ducrohet
am b7b877a4: (-s ours) am 0a98226e: Merge 9d76581f...
tree
|
commitdiff
2011-03-15
Xavier Ducrohet
am a82a219a: (-s ours) am b243aabd: Merge adaa12cd...
tree
|
commitdiff
2011-03-15
Brad Fitzpatrick
am 403da3a7: am 8d25eab1: Merge "Releasing lock even...
tree
|
commitdiff
2011-03-15
Brad Fitzpatrick
am a74887e8: am 56c4c442: Merge "Lazy initialization...
tree
|
commitdiff
2011-03-15
Brad Fitzpatrick
am 9ac9b285: am b98c8fca: Merge "Removing self-assignme...
tree
|
commitdiff
2011-03-15
Brad Fitzpatrick
am b01fc9fb: (-s ours) am 8b5345fb: Merge "Fixing self...
tree
|
commitdiff
2011-03-15
Xavier Ducrohet
am f89c3729: (-s ours) am 48a2a5ad: Merge "Merge 6f2fb5...
tree
|
commitdiff
2011-03-15
Xavier Ducrohet
am 405cb570: (-s ours) am 14e1f523: Merge "Merge c12b40...
tree
|
commitdiff
2011-03-15
Brad Fitzpatrick
resolved conflicts for merge of ceae9983 to honeycomb...
tree
|
commitdiff
2011-03-15
Brad Fitzpatrick
am b7d573e9: am 7972e382: Merge "Removing repetitive...
tree
|
commitdiff
2011-03-15
Brad Fitzpatrick
am c86ea5e2: am 38c6e31c: Merge "Removing repetitive...
tree
|
commitdiff
2011-03-15
Brad Fitzpatrick
am 33dd1bae: am 29d75c9a: Merge "Fixing improper boxing...
tree
|
commitdiff
2011-03-15
Brad Fitzpatrick
am cd7dfcec: (-s ours) am 40b207c1: Merge "Using proper...
tree
|
commitdiff
2011-03-15
Brad Fitzpatrick
am c73c4a36: (-s ours) am b37f7e59: Merge changes I81fc...
tree
|
commitdiff
2011-03-15
Dianne Hackborn
am cffde30f: am 44220a56: Merge "Add some debug code...
tree
|
commitdiff
2011-03-15
Ying Wang
am e422f7a2: am bf079216: Dist classes.jar with full...
tree
|
commitdiff
2011-03-15
Mike Lockwood
am ccdac700: (-s ours) am 78b8e1be: Merge "DO NOT MERGE...
tree
|
commitdiff
2011-03-15
Simon Wilson
am 81e1ed7e: (-s ours) am ee3f6ef2: Merge "DO NOT MERGE...
tree
|
commitdiff
2011-03-15
Daniel Sandler
am 9bbaa156: (-s ours) am 45660662: Merge "Workaround...
tree
|
commitdiff
2011-03-14
Gilles Debunne
am 816dd3d4: (-s ours) resolved conflicts for merge...
tree
|
commitdiff
2011-03-14
Kenny Root
am 206c62ed: am 2fdf829a: Merge "Remove unnecessary...
tree
|
commitdiff
2011-03-14
James Dong
am 7d93b757: (-s ours) am 68f66b94: Merge "MP3Extractor...
tree
|
commitdiff
2011-03-14
Ying Wang
am e5570255: am 69e725eb: Merge "Dist com.android.nfc_e...
tree
|
commitdiff
2011-03-14
Robert Greenwalt
am 2e741556: (-s ours) am b5c51d5f: Merge "DO NOT MERGE...
tree
|
commitdiff
2011-03-14
Nick Pelly
resolved conflicts for merge of 38d0d562 to honeycomb...
tree
|
commitdiff
2011-03-11
Robert Greenwalt
resolved conflicts for merge of 55b53d35 to honeycomb...
tree
|
commitdiff
2011-03-10
TK MUN
am c01fd043: (-s ours) am 4bdab175: DO NOT MERGE WiMAX...
tree
|
commitdiff
2011-03-10
Mathias Agopian
am a15b5290: (-s ours) am 33029221: Merge "revert the...
tree
|
commitdiff
2011-03-10
Mathias Agopian
am b4341ba6: (-s ours) am b710a50a: Merge "fix [3452750...
tree
|
commitdiff
2011-03-10
Mathias Agopian
am a7c836dd: (-s ours) am c05d35db: Merge "fix [4026375...
tree
|
commitdiff
2011-03-09
Lorenzo Colitti
am 8df2477c: am bd0e806a: Support IPv6->IPv4 fallback...
tree
|
commitdiff
2011-03-09
Lorenzo Colitti
am e4a02b61: am b9da16a1: Support IPv6 in HTTP streaming.
tree
|
commitdiff
2011-03-08
Mathias Agopian
am de6a47a3: (-s ours) am df6410dc: Merge "Fix [3513017...
tree
|
commitdiff
2011-03-08
Simon Wilson
am 10993b2d: am 6b6869d5: Merge "mms: mms wap push...
tree
|
commitdiff
next