summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge "webkit: enable no-pic compiling option"Jean-Baptiste Queru2012-08-301-0/+4
|\
| * webkit: enable no-pic compiling optionbxu10X2012-08-141-0/+4
* | Merge "Fix memory leak caused by CSSRuleList wrapper"Jean-Baptiste Queru2012-08-2816-38/+50
|\ \
| * | Fix memory leak caused by CSSRuleList wrapperxqian62012-08-2416-38/+50
|/ /
* | Merge "host modules don't need LOCAL_MODULE_TAGS"Joe Onorato2012-08-161-2/+0
|\ \ | |/ |/|
| * host modules don't need LOCAL_MODULE_TAGSJoe Onorato2012-08-151-2/+0
|/
* Merge "Fix browser rendering issue: pure color tiles are rendered black"John Reck2012-08-021-1/+1
|\
| * Fix browser rendering issue: pure color tiles are rendered blackYuyang Du2012-08-011-1/+1
|/
* Reconcile AOSP master and JellyBeanJean-Baptiste Queru2012-06-260-0/+0
|\
| * Reconcile AOSP master and JellyBeanJean-Baptiste Queru2012-06-260-0/+0
| |\ | |/ |/|
* | resolved conflicts for merge of 343fe48a to jb-dev-plus-aospJean-Baptiste Queru2012-06-251-9/+9
|\ \ | |/
| * Merge "Accept-Language header is not updated when phone language changes"Jean-Baptiste Queru2012-06-251-9/+9
| |\
| | * Accept-Language header is not updated when phone language changesAnders Edenbrandt2012-06-211-9/+9
* | | Reconcile with jb-releaseThe Android Open Source Project2012-06-220-0/+0
|\ \ \
| * \ \ merge in jb-release history after reset to jb-devThe Android Automerger2012-06-210-0/+0
| |\ \ \
| | * \ \ merge in jb-release history after reset to jb-devThe Android Automerger2012-06-210-0/+0
| | |\ \ \
* | | \ \ \ am 8ac8b3f2: Merge "Make viewport dirtyness calculations recursive" into jb-devChris Craik2012-06-211-0/+3
|\ \ \ \ \ \ | |/ / / / /
| * | | | | Merge "Make viewport dirtyness calculations recursive" into jb-devChris Craik2012-06-211-0/+3
| |\ \ \ \ \ | | |/ / / / | |/| | | |
| | * | | | Make viewport dirtyness calculations recursiveChris Craik2012-06-211-0/+3
* | | | | | am c6d9134e: Don\'t allow layers that draw via drawGL to merge with other sur...Chris Craik2012-06-213-2/+6
|\ \ \ \ \ \ | |/ / / / /
| * | | | | Don't allow layers that draw via drawGL to merge with other surfacesChris Craik2012-06-203-2/+6
| |/ / / /
* | | | | am 903d2ec9: Merge "Don\'t use deleted Node object in setSizeScreenWidthAndSc...Jean-Baptiste Queru2012-06-201-1/+1
|\ \ \ \ \ | | |_|/ / | |/| | |
| * | | | Merge "Don't use deleted Node object in setSizeScreenWidthAndScale"Jean-Baptiste Queru2012-06-201-1/+1
| |\ \ \ \ | | |_|_|/ | |/| | |
| | * | | Don't use deleted Node object in setSizeScreenWidthAndScaleMattias Falk2012-06-191-1/+1
| |/ / /
* | | | Reconcile with jb-releaseThe Android Open Source Project2012-06-190-0/+0
|\ \ \ \ | | |_|/ | |/| |
| * | | merge in jb-release history after reset to jb-devThe Android Automerger2012-06-160-0/+0
| |\ \ \ | | |_|/ | |/| |
| | * | merge in jb-release history after reset to jb-devThe Android Automerger2012-06-130-0/+0
| | |\ \
| | | * \ merge in jb-release history after reset to jb-devThe Android Automerger2012-06-120-0/+0
| | | |\ \
* | | | \ \ am 4dd92d0a: DO NOT MERGE Respect the "Make password visible" setting.George Mount2012-06-141-2/+6
|\ \ \ \ \ \ | |/ / / / /
| * | | | | DO NOT MERGE Respect the "Make password visible" setting.George Mount2012-06-141-2/+6
| |/ / / /
* | | | | am b8dbaafe: Merge "Call the right updatePositions*" into jb-devJohn Reck2012-06-122-8/+8
|\ \ \ \ \ | |/ / / /
| * | | | Merge "Call the right updatePositions*" into jb-devJohn Reck2012-06-122-8/+8
| |\ \ \ \
| | * | | | Call the right updatePositions*John Reck2012-06-112-8/+8
* | | | | | am 9b2be716: Merge "Workaround double blit failure" into jb-devChris Craik2012-06-123-0/+12
|\ \ \ \ \ \ | |/ / / / /
| * | | | | Merge "Workaround double blit failure" into jb-devChris Craik2012-06-123-0/+12
| |\ \ \ \ \
| | * | | | | Workaround double blit failureChris Craik2012-06-123-0/+12
| | | |/ / / | | |/| | |
* | | | | | am a762e7bf: Crash fix by checking null pointerTeng-Hui Zhu2012-06-121-1/+1
|\ \ \ \ \ \ | |/ / / / /
| * | | | | Crash fix by checking null pointerTeng-Hui Zhu2012-06-121-1/+1
| |/ / / /
* | | | | am e0766f08: (-s ours) am 31874a9d: (-s ours) Merge "DO NOT MERGE Add webkit ...Geremy Condra2012-06-110-0/+0
|\ \ \ \ \
| * \ \ \ \ am 31874a9d: (-s ours) Merge "DO NOT MERGE Add webkit plumbing for file origi...Geremy Condra2012-06-110-0/+0
| |\ \ \ \ \ | | | |_|_|/ | | |/| | |
| | * | | | Merge "DO NOT MERGE Add webkit plumbing for file origin policy"Geremy Condra2012-06-111-0/+14
| | |\ \ \ \
| | | * | | | DO NOT MERGE Add webkit plumbing for file origin policySelim Gurun2012-06-061-0/+14
| | |/ / / /
* | | | | | am 7fc1c095: Merge "Remove forgotten CHROME_NETWORK_STACK macros" into jb-devSelim Gurun2012-06-111-2/+0
|\ \ \ \ \ \ | | |_|/ / / | |/| | | |
| * | | | | Merge "Remove forgotten CHROME_NETWORK_STACK macros" into jb-devSelim Gurun2012-06-111-2/+0
| |\ \ \ \ \ | | |_|_|/ / | |/| | | |
| | * | | | Remove forgotten CHROME_NETWORK_STACK macrosSelim Gurun2012-06-081-2/+0
* | | | | | Reconcile with jb-releaseThe Android Open Source Project2012-06-110-0/+0
|\ \ \ \ \ \ | | |_|_|_|/ | |/| | | |
| * | | | | merge in jb-release history after reset to jb-devThe Android Automerger2012-06-110-0/+0
| |\ \ \ \ \
| | * \ \ \ \ merge in jb-release history after reset to jb-devThe Android Automerger2012-06-080-0/+0
| | |\ \ \ \ \
* | | \ \ \ \ \ am efe3bf4f: Merge "Disable dispatchFakeMouseMoveEvent when scrolling a rende...John Reck2012-06-111-0/+2
|\ \ \ \ \ \ \ \ | | |_|_|/ / / / | |/| | | | | |
| * | | | | | | Merge "Disable dispatchFakeMouseMoveEvent when scrolling a render layer" into...John Reck2012-06-111-0/+2
| |\ \ \ \ \ \ \ | | |/ / / / / / | |/| | | | | |
generated by cgit v1.1 at 2024-11-01 03:47:10 +0000