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
resolved conflicts for merge of 2c311be7 to honeycomb-plus-aosp
[android-x86/frameworks-base.git]
/
location
/
tests
/
locationtests
/
2011-07-20
Xavier Ducrohet
resolved conflicts for merge of 2c311be7 to honeycomb...
tree
|
commitdiff
2011-07-19
Xavier Ducrohet
am ba6c98db: am 82943ecf: am d40c93f6: Merge "Add depen...
tree
|
commitdiff
2011-07-19
Xavier Ducrohet
am d5431ed5: am 2e659ae5: am 42755155: Merge "Copy...
tree
|
commitdiff
2011-07-18
Conley Owens
am a4aef41a: am a74774fd: am 4d8f6a38: Merge "stagefrig...
tree
|
commitdiff
2011-07-18
Deckard Autoverifier
am 2acddc54: am 89bac182: am 88409911: Merge "stagefrig...
tree
|
commitdiff
2011-07-18
Deckard Autoverifier
am 31140598: am 16db83c2: am eb07c531: Merge "stagefrig...
tree
|
commitdiff
2011-07-18
Deckard Autoverifier
am 29fd8cdb: am 80ef1745: am c06c3603: Merge "stagefrig...
tree
|
commitdiff
2011-07-18
Deckard Autoverifier
am 691257b1: am 68e37dac: am 55f115a3: Merge "stagefrig...
tree
|
commitdiff
2011-07-18
Conley Owens
am 45ddd425: am 3edba93f: am 98fcc404: Merge "stagefrig...
tree
|
commitdiff
2011-07-15
Nick Pelly
am 1bce9e25: am 01588aca: Merge "Preserve invariant...
tree
|
commitdiff
2011-07-13
Jaikumar Ganesh
resolved conflicts for merge of ab3ec176 to honeycomb...
tree
|
commitdiff
2011-07-11
David 'Digit' Turner
am db4c5f35: resolved conflicts for merge of 7816eded...
tree
|
commitdiff
2011-07-06
Robert Greenwalt
am 7022db4c: am 2b62c4fb: am 38bb0123: Merge "Added...
tree
|
commitdiff
2011-06-30
Conley Owens
am 98395483: am 9f2cbf14: am e06749e1: Merge "Add FLAG_...
tree
|
commitdiff
2011-06-29
Xavier Ducrohet
am 842725fc: (-s ours) am 4d825e1f: Merge "Bring in...
tree
|
commitdiff
2011-06-29
Xavier Ducrohet
am 9bce27a9: (-s ours) am 4753498d: Merge "CherryPick...
tree
|
commitdiff
2011-06-29
Xavier Ducrohet
am 155cf6c1: (-s ours) am 9918ffb0: Merge "CherryPick...
tree
|
commitdiff
2011-06-29
Xavier Ducrohet
am e0947693: (-s ours) am 54146a63: Merge "DO NOT MERGE...
tree
|
commitdiff
2011-06-29
mike wakerly
am af08ddbc: am 2f9ad8b4: Add intent actions for new...
tree
|
commitdiff
2011-06-24
Jean-Baptiste Queru
am 99c070d8: am 4fea5373: Merge "Add WEBP to the list...
tree
|
commitdiff
2011-06-24
Jean-Baptiste Queru
am 7595e84d: (-s ours) am f458d5fd: Merge "Tweak for...
tree
|
commitdiff
2011-06-23
Raphael Moll
am 2b5f2d01: am e2b41b0d: Merge "Laoutlib_creator:...
tree
|
commitdiff
2011-06-21
Jaikumar Ganesh
am 9e5d0de9: (-s ours) am b38fa2a0: Merge "DO NOT MERGE...
tree
|
commitdiff
2011-06-20
Nick Pelly
am 6f1a8edc: am 17523abb: NFC Adapter Extras API update.
tree
|
commitdiff
2011-06-20
Conley Owens
am c1b62e3b: am bf5adfa5: Merge "Check if we are in...
tree
|
commitdiff
2011-06-20
Jean-Baptiste Queru
am ff3ead50: (-s ours) am e3b05d09: Merge "Tweaks for...
tree
|
commitdiff
2011-06-16
Maarten Hooft
am 42781a11: am d76baeb4: Merge "Import revised Croatia...
tree
|
commitdiff
2011-06-15
Irfan Sheriff
am a4644307: (-s ours) am df1734e3: Fix lease duration...
tree
|
commitdiff
2011-06-15
Jean-Baptiste Queru
Merge 5137711109783dcbb20143d3e5cab2fa931218dd
tree
|
commitdiff
2011-06-15
Marco Nelissen
am d8f9a83c: resolved conflicts for merge of d027329c...
tree
|
commitdiff
2011-06-13
Jean-Baptiste Queru
Merge/Ignore 653fd9cf
tree
|
commitdiff
2011-06-13
Dan Morrill
Fix merge conflict for 'c2e1e329'.
tree
|
commitdiff
2011-06-09
Conley Owens
am 644f36ea: am d8b027b1: Merge "stagefright aacenc...
tree
|
commitdiff
2011-06-09
Marco Nelissen
am 90dc22fa: am a02d9bf9: Make sure we don\'t read...
tree
|
commitdiff
2011-06-09
Mathias Agopian
am 17574b9a: (-s ours) am 19974ecc: Fix a leak in RefBa...
tree
|
commitdiff
2011-06-08
Jean-Baptiste Queru
am 0315a2c5: (-s ours) am f3894a04: Merge "Tweak setVie...
tree
|
commitdiff
2011-06-07
Jake Hamby
am ae62b7b0: resolved conflicts for merge of 66040bbb...
tree
|
commitdiff
2011-06-07
Xavier Ducrohet
am 67f09cd0: (-s ours) am d6ce6791: Merge "Cherrypick...
tree
|
commitdiff
2011-06-07
Xavier Ducrohet
am ab3f5779: (-s ours) am ee1b4976: Merge changes I035c...
tree
|
commitdiff
2011-06-07
Romain Guy
am fbef58fa: am 258f32e2: Merge "Disable plugins if...
tree
|
commitdiff
2011-06-07
Jake Hamby
resolved conflicts for merge of 0cb17a52 to honeycomb...
tree
|
commitdiff
2011-06-07
Andreas Huber
am 8e973729: (-s ours) am 8050a02b: DO NOT MERGE: Linux...
tree
|
commitdiff
2011-06-07
Martijn Coenen
am ed1c8d7d: am 0aa1017f: Prevent allocation overflows...
tree
|
commitdiff
2011-06-07
Jaikumar Ganesh
am c8410017: (-s ours) am 1b755dea: Merge "Remove disco...
tree
|
commitdiff
2011-06-06
TK MUN
am cecb710a: am 94260caf: Allow control over search...
tree
|
commitdiff
2011-06-06
Jaikumar Ganesh
am 58ada2f3: am 94062517: Merge "Require bonding and...
tree
|
commitdiff
2011-06-06
Jean-Baptiste Queru
am 54ab72e1: am 038e8f99: Merge "Adding support for...
tree
|
commitdiff
2011-06-06
Marco Nelissen
resolved conflicts for merge of b9783b49 to honeycomb...
tree
|
commitdiff
2011-05-29
Conley Owens
am 10b364b4: am 4cf0eee7: Merge "Fixing concurrency...
tree
|
commitdiff
2011-05-29
Xavier Ducrohet
am 228e4716: (-s ours) am 34f5991e: Merge 6103e22c...
tree
|
commitdiff
2011-05-29
Xavier Ducrohet
am af83d4ec: (-s ours) am c7b87766: Merge 2402ad60...
tree
|
commitdiff
2011-05-26
Simon Wilson
resolved conflicts for merge of a38fad37 to honeycomb...
tree
|
commitdiff
2011-05-23
TK MUN
am 59c87cb6: (-s ours) am 6f0394a3: DO NOT MERGE System...
tree
|
commitdiff
2011-05-23
Xavier Ducrohet
am 5b9ec687: (-s ours) am 4c1e73b6: Merge e57aa434...
tree
|
commitdiff
2011-05-23
Xavier Ducrohet
am 041fd74b: (-s ours) am f791863f: Merge "Merge 05b7b6...
tree
|
commitdiff
2011-05-23
Xavier Ducrohet
am 9d9a7466: (-s ours) am bb43828a: Merge "Merge 2fae85...
tree
|
commitdiff
2011-05-20
Jaikumar Ganesh
am d1735ef9: am 4b41df61: Merge "Use proper type for...
tree
|
commitdiff
2011-05-20
Jaikumar Ganesh
am d7030e55: am 198ed3e4: Merge "BT: Wrong publishing...
tree
|
commitdiff
2011-05-20
Jaikumar Ganesh
am 0c2d82c6: am 848a1e3d: Merge "OBEX: Fix PrivateOutpu...
tree
|
commitdiff
2011-05-19
Kenny Root
resolved conflicts for merge of 2433c443 to honeycomb...
tree
|
commitdiff
2011-05-18
Jean-Baptiste Queru
Merge 4b999030
tree
|
commitdiff
2011-05-18
Jean-Baptiste Queru
am a38762f3: am 7ae7d31c: Merge "MOTOYA changed two...
tree
|
commitdiff
2011-05-12
Jean-Baptiste Queru
am 2d7d3f78: (-s ours) am f247e545: Merge "Adapt to...
tree
|
commitdiff
2011-05-12
Jean-Baptiste Queru
am a84d29cb: am 6714e677: Merge "Ninepatch tweaks for...
tree
|
commitdiff
2011-05-12
Jean-Baptiste Queru
am 20fd3f0d: am 4770c79c: Merge "Tweak audio APIs for...
tree
|
commitdiff
2011-05-12
Jean-Baptiste Queru
am e8b669cb: (-s ours) am 71d25778: Merge "Switch to...
tree
|
commitdiff
2011-05-11
Irfan Sheriff
am aa1fd701: (-s ours) am 8dd85f80: Merge "Move Wifi...
tree
|
commitdiff
2011-05-10
Conley Owens
am 87d86044: am bcd029b6: Merge "Add missing clean...
tree
|
commitdiff
2011-05-10
Jake Hamby
resolved conflicts for merge of 18cc814c to honeycomb...
tree
|
commitdiff
2011-05-05
Irfan Sheriff
am 8a14d8b9: am 1a5b6098: Handle GET_POWER failures
tree
|
commitdiff
2011-05-04
Dan Morrill
am dacce73b: (-s ours) am 4ec33c2a: Do not merge. Cherr...
tree
|
commitdiff
2011-05-03
Conley Owens
am eac835e5: am 9c4ba258: Merge "Removing dead store...
tree
|
commitdiff
2011-04-30
Conley Owens
Merged "Adjust mBiggerTouchSlopSquare to the suitable...
tree
|
commitdiff
2011-04-30
Conley Owens
Merge commit 'b737647d' (Scrolling using arrow keys...
tree
|
commitdiff
2011-04-30
Conley Owens
am 19653c64: am 425db473: Merge "CHAR_SEQUENCE_CREATOR...
tree
|
commitdiff
2011-04-30
Conley Owens
am a47c0d29: am 58e4a5e2: Merge "Fixed to draw texture...
tree
|
commitdiff
2011-04-30
Conley Owens
am 520dd927: am 9355a24a: Merge "Fixing wrong Japanese...
tree
|
commitdiff
2011-04-30
Conley Owens
am 718516f3: am 9fd8e057: Merge "Fix memory leak of...
tree
|
commitdiff
2011-04-30
Conley Owens
Ignore ALT and SHIFT modifiers since they now exist...
tree
|
commitdiff
2011-04-30
Conley Owens
am 1a846ab0: am b1578d85: Merge "Fix startSearch condit...
tree
|
commitdiff
2011-04-30
Conley Owens
Ignore slide ui change because it is obselete in newly...
tree
|
commitdiff
2011-04-29
Conley Owens
am af99655e: am 69ef0d55: Merge "Adding missing breaks...
tree
|
commitdiff
2011-04-29
Conley Owens
Ignore fix since it is obsolete in newly refactored...
tree
|
commitdiff
2011-04-29
Conley Owens
am 52749c0b: am 03daee63: Merge "frameworks/base: acqui...
tree
|
commitdiff
2011-04-29
Conley Owens
am e321d064: am 2f463ef1: Merge "Adding a sanity test...
tree
|
commitdiff
2011-04-29
Conley Owens
am 7bcb2f39: am c5505f6a: Merge "Improved conversion...
tree
|
commitdiff
2011-04-29
Conley Owens
Ignore broken image fix since identical change exists...
tree
|
commitdiff
2011-04-29
Conley Owens
am 54668b8a: am e1787009: Merge "Added null check on...
tree
|
commitdiff
2011-04-29
Conley Owens
am f26ec38c: am 501f7bca: Merge "Eliminating dead logic...
tree
|
commitdiff
2011-04-29
Conley Owens
am eef8f148: am 11d7ec24: Merge "Removing unnecessary...
tree
|
commitdiff
2011-04-29
Conley Owens
am 8b22ef66: am e41d2aed: Merge "Using robust equality...
tree
|
commitdiff
2011-04-29
Conley Owens
am a9517012: am 1e29552b: Merge "We don\'t need these...
tree
|
commitdiff
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
next