OSDN Git Service
(root)
/
android-x86
/
frameworks-native.git
/ history
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
first ⋅ prev ⋅
next
Merge/Ignore 653fd9cf
[android-x86/frameworks-native.git]
/
libs
/
ui
/
VirtualKeyMap.cpp
2011-06-13
Jean-Baptiste Queru
Merge/Ignore 653fd9cf
blob
|
commitdiff
2011-06-13
Dan Morrill
Fix merge conflict for 'c2e1e329'.
blob
|
commitdiff
2011-06-09
Conley Owens
am 644f36ea: am d8b027b1: Merge "stagefright aacenc...
blob
|
commitdiff
2011-06-09
Marco Nelissen
am 90dc22fa: am a02d9bf9: Make sure we don\'t read...
blob
|
commitdiff
2011-06-09
Mathias Agopian
am 17574b9a: (-s ours) am 19974ecc: Fix a leak in RefBa...
blob
|
commitdiff
2011-06-08
Jean-Baptiste Queru
am 0315a2c5: (-s ours) am f3894a04: Merge "Tweak setVie...
blob
|
commitdiff
2011-06-07
Jake Hamby
am ae62b7b0: resolved conflicts for merge of 66040bbb...
blob
|
commitdiff
2011-06-07
Xavier Ducrohet
am 67f09cd0: (-s ours) am d6ce6791: Merge "Cherrypick...
blob
|
commitdiff
2011-06-07
Xavier Ducrohet
am ab3f5779: (-s ours) am ee1b4976: Merge changes I035c...
blob
|
commitdiff
2011-06-07
Romain Guy
am fbef58fa: am 258f32e2: Merge "Disable plugins if...
blob
|
commitdiff
2011-06-07
Jake Hamby
resolved conflicts for merge of 0cb17a52 to honeycomb...
blob
|
commitdiff
2011-06-07
Andreas Huber
am 8e973729: (-s ours) am 8050a02b: DO NOT MERGE: Linux...
blob
|
commitdiff
2011-06-07
Martijn Coenen
am ed1c8d7d: am 0aa1017f: Prevent allocation overflows...
blob
|
commitdiff
2011-06-07
Jaikumar Ganesh
am c8410017: (-s ours) am 1b755dea: Merge "Remove disco...
blob
|
commitdiff
2011-06-06
TK MUN
am cecb710a: am 94260caf: Allow control over search...
blob
|
commitdiff
2011-06-06
Jaikumar Ganesh
am 58ada2f3: am 94062517: Merge "Require bonding and...
blob
|
commitdiff
2011-06-06
Jean-Baptiste Queru
am 54ab72e1: am 038e8f99: Merge "Adding support for...
blob
|
commitdiff
2011-06-06
Marco Nelissen
resolved conflicts for merge of b9783b49 to honeycomb...
blob
|
commitdiff
2011-05-29
Conley Owens
am 10b364b4: am 4cf0eee7: Merge "Fixing concurrency...
blob
|
commitdiff
2011-05-29
Xavier Ducrohet
am 228e4716: (-s ours) am 34f5991e: Merge 6103e22c...
blob
|
commitdiff
2011-05-29
Xavier Ducrohet
am af83d4ec: (-s ours) am c7b87766: Merge 2402ad60...
blob
|
commitdiff
2011-05-26
Simon Wilson
resolved conflicts for merge of a38fad37 to honeycomb...
blob
|
commitdiff
2011-05-23
TK MUN
am 59c87cb6: (-s ours) am 6f0394a3: DO NOT MERGE System...
blob
|
commitdiff
2011-05-23
Xavier Ducrohet
am 5b9ec687: (-s ours) am 4c1e73b6: Merge e57aa434...
blob
|
commitdiff
2011-05-23
Xavier Ducrohet
am 041fd74b: (-s ours) am f791863f: Merge "Merge 05b7b6...
blob
|
commitdiff
2011-05-23
Xavier Ducrohet
am 9d9a7466: (-s ours) am bb43828a: Merge "Merge 2fae85...
blob
|
commitdiff
2011-05-20
Jaikumar Ganesh
am d1735ef9: am 4b41df61: Merge "Use proper type for...
blob
|
commitdiff
2011-05-20
Jaikumar Ganesh
am d7030e55: am 198ed3e4: Merge "BT: Wrong publishing...
blob
|
commitdiff
2011-05-20
Jaikumar Ganesh
am 0c2d82c6: am 848a1e3d: Merge "OBEX: Fix PrivateOutpu...
blob
|
commitdiff
2011-05-19
Kenny Root
resolved conflicts for merge of 2433c443 to honeycomb...
blob
|
commitdiff
2011-05-18
Jean-Baptiste Queru
Merge 4b999030
blob
|
commitdiff
2011-05-18
Jean-Baptiste Queru
am a38762f3: am 7ae7d31c: Merge "MOTOYA changed two...
blob
|
commitdiff
2011-05-12
Jean-Baptiste Queru
am 2d7d3f78: (-s ours) am f247e545: Merge "Adapt to...
blob
|
commitdiff
2011-05-12
Jean-Baptiste Queru
am a84d29cb: am 6714e677: Merge "Ninepatch tweaks for...
blob
|
commitdiff
2011-05-12
Jean-Baptiste Queru
am 20fd3f0d: am 4770c79c: Merge "Tweak audio APIs for...
blob
|
commitdiff
2011-05-12
Jean-Baptiste Queru
am e8b669cb: (-s ours) am 71d25778: Merge "Switch to...
blob
|
commitdiff
2011-05-11
Irfan Sheriff
am aa1fd701: (-s ours) am 8dd85f80: Merge "Move Wifi...
blob
|
commitdiff
2011-05-10
Conley Owens
am 87d86044: am bcd029b6: Merge "Add missing clean...
blob
|
commitdiff
2011-05-10
Jake Hamby
resolved conflicts for merge of 18cc814c to honeycomb...
blob
|
commitdiff
2011-05-05
Irfan Sheriff
am 8a14d8b9: am 1a5b6098: Handle GET_POWER failures
blob
|
commitdiff
2011-05-04
Dan Morrill
am dacce73b: (-s ours) am 4ec33c2a: Do not merge. Cherr...
blob
|
commitdiff
2011-05-03
Conley Owens
am eac835e5: am 9c4ba258: Merge "Removing dead store...
blob
|
commitdiff
2011-04-30
Conley Owens
Merged "Adjust mBiggerTouchSlopSquare to the suitable...
blob
|
commitdiff
2011-04-30
Conley Owens
Merge commit 'b737647d' (Scrolling using arrow keys...
blob
|
commitdiff
2011-04-30
Conley Owens
am 19653c64: am 425db473: Merge "CHAR_SEQUENCE_CREATOR...
blob
|
commitdiff
2011-04-30
Conley Owens
am a47c0d29: am 58e4a5e2: Merge "Fixed to draw texture...
blob
|
commitdiff
2011-04-30
Conley Owens
am 520dd927: am 9355a24a: Merge "Fixing wrong Japanese...
blob
|
commitdiff
2011-04-30
Conley Owens
am 718516f3: am 9fd8e057: Merge "Fix memory leak of...
blob
|
commitdiff
2011-04-30
Conley Owens
Ignore ALT and SHIFT modifiers since they now exist...
blob
|
commitdiff
2011-04-30
Conley Owens
am 1a846ab0: am b1578d85: Merge "Fix startSearch condit...
blob
|
commitdiff
2011-04-30
Conley Owens
Ignore slide ui change because it is obselete in newly...
blob
|
commitdiff
2011-04-29
Conley Owens
am af99655e: am 69ef0d55: Merge "Adding missing breaks...
blob
|
commitdiff
2011-04-29
Conley Owens
Ignore fix since it is obsolete in newly refactored...
blob
|
commitdiff
2011-04-29
Conley Owens
am 52749c0b: am 03daee63: Merge "frameworks/base: acqui...
blob
|
commitdiff
2011-04-29
Conley Owens
am e321d064: am 2f463ef1: Merge "Adding a sanity test...
blob
|
commitdiff
2011-04-29
Conley Owens
am 7bcb2f39: am c5505f6a: Merge "Improved conversion...
blob
|
commitdiff
2011-04-29
Conley Owens
Ignore broken image fix since identical change exists...
blob
|
commitdiff
2011-04-29
Conley Owens
am 54668b8a: am e1787009: Merge "Added null check on...
blob
|
commitdiff
2011-04-29
Conley Owens
am f26ec38c: am 501f7bca: Merge "Eliminating dead logic...
blob
|
commitdiff
2011-04-29
Conley Owens
am eef8f148: am 11d7ec24: Merge "Removing unnecessary...
blob
|
commitdiff
2011-04-29
Conley Owens
am 8b22ef66: am e41d2aed: Merge "Using robust equality...
blob
|
commitdiff
2011-04-29
Conley Owens
am a9517012: am 1e29552b: Merge "We don\'t need these...
blob
|
commitdiff
2011-04-29
Conley Owens
am d66a92e6: am da882181: Merge "Eliminating dead code...
blob
|
commitdiff
2011-04-29
Conley Owens
am 893812b2: am e6e3322a: am 8fff7805: Merge "Remove...
blob
|
commitdiff
2011-04-28
Eric Fischer
am 1d104476: (-s ours) am a4e7353d: Import revised...
blob
|
commitdiff
2011-04-28
Conley Owens
Ignore change since file no longer exists
blob
|
commitdiff
2011-04-27
Conley Owens
Merge commit '5e3562a5' into m
blob
|
commitdiff
2011-04-27
Conley Owens
Ignore xml change since file no longer exists
blob
|
commitdiff
2011-04-27
Conley Owens
am ac505b86: am f0556bb9: am 86d1d747: Merge "Add lock...
blob
|
commitdiff
2011-04-27
Conley Owens
am 470239a0: am 30d59fa9: Ignore fix for startup NPE...
blob
|
commitdiff
2011-04-27
Nick Pelly
am 36e6c4c1: am cc9ee72b: Implement dead service recove...
blob
|
commitdiff
2011-04-26
Conley Owens
am 54a952c8: am bf4769c7: am 17ba30b5: Merge "Load...
blob
|
commitdiff
2011-04-26
Kenny Root
am bb93dad9: am bb10986c: am 13ce221e: Merge "libutils...
blob
|
commitdiff
2011-04-26
Jean-Baptiste Queru
am 45e13ec1: am 5fcfce96: am 4b72eec3: Merge "Re-assing...
blob
|
commitdiff
2011-04-26
Irfan Sheriff
am 78d4e71d: (-s ours) am d2127c43: Handle DHCP renewal...
blob
|
commitdiff
2011-04-19
Jaikumar Ganesh
am 24a16e6c: am c34c88b9: am ec1a8f7a: Merge "Unable...
blob
|
commitdiff
2011-04-18
Andreas Huber
am 5ce9eb9a: (-s ours) am f0f1ceeb: DO NOT MERGE: Make...
blob
|
commitdiff
2011-04-12
Eric Fischer
am 68cb0ffa: (-s ours) am 71a556f2: Import revised...
blob
|
commitdiff
2011-04-12
Kenny Root
resolved conflicts for merge of 87b3c0dc to honeycomb...
blob
|
commitdiff
2011-04-12
Brad Fitzpatrick
am 4430670f: am ca7ad44a: Merge "audioflinger: Enable...
blob
|
commitdiff
2011-04-12
Xavier Ducrohet
resolved conflicts for merge of 4754c79a to honeycomb...
blob
|
commitdiff
2011-04-11
Xavier Ducrohet
resolved conflicts for merge of efa98a29 to honeycomb...
blob
|
commitdiff
2011-04-11
Mike Lockwood
am 9645081c: am 43707a83: UsbManager: minor Javadoc...
blob
|
commitdiff
2011-04-11
Jason parks
am 7f506024: am 78a9766b: Merge "Implement teardown...
blob
|
commitdiff
2011-04-11
Jeff Hamilton
am 7bb236c3: am 84d34078: Make the NFC UID forward...
blob
|
commitdiff
2011-04-11
James Dong
am b0ccbacd: (-s ours) am ea5d2c58: Merge "When read...
blob
|
commitdiff
2011-04-05
Eric Laurent
am b7a76e84: am a482d83c: Merge "Issue 4157048: mic...
blob
|
commitdiff
2011-04-05
Mike Lockwood
am 179122ad: (-s ours) am a8731e1e: Merge "DO NOT MERGE...
blob
|
commitdiff
2011-04-05
Trevor Johns
am ea477d20: am cafbe87d: Merge "Fixing line in Market...
blob
|
commitdiff
2011-04-05
Simon Wilson
am d7a8e845: (-s ours) am ec944728: Merge "DO NOT MERGE...
blob
|
commitdiff
2011-04-04
Eric Fischer
am d20023ae: (-s ours) am 8b312c6c: Merge "Import revis...
blob
|
commitdiff
2011-04-04
Jason parks
am 1d733625: am cca2f2f9: Merge "Send out a broadcast...
blob
|
commitdiff
2011-04-04
Justin Ho
am 0f5e36de: am 87805ca3: Updated CDMA roaming icons
blob
|
commitdiff
2011-04-04
Jean-Baptiste Queru
am 0c61e105: am bef31431: No-op - reconcile with open...
blob
|
commitdiff
2011-04-04
Robert Greenwalt
resolved conflicts for merge of ab2194aa to honeycomb...
blob
|
commitdiff
2011-04-04
Robert Greenwalt
am 37229514: Merge "resolved conflicts for merge of...
blob
|
commitdiff
2011-04-04
Brad Fitzpatrick
am 27e00544: am 9907d161: Merge "Fix data corruption...
blob
|
commitdiff
2011-04-04
Brad Fitzpatrick
am 9b1b6439: am 2ed72048: Merge "Always return a valid...
blob
|
commitdiff
2011-04-04
Brad Fitzpatrick
am f7a34b15: am e558a000: Merge "Avoid crash in system...
blob
|
commitdiff
2011-04-04
Robert Greenwalt
resolved conflicts for merge of 92d72ca0 to honeycomb...
blob
|
commitdiff
next