summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
...
* | | | | | | | Merge "Enable multiple tile painting threads"Chris Craik2012-06-196-44/+85
|\ \ \ \ \ \ \ \ | |/ / / / / / / | | / / / / / / | |/ / / / / / |/| | | | | |
| * | | | | | Enable multiple tile painting threadsChris Craik2012-06-196-44/+85
* | | | | | | Merge "Clip selected text within scrollable edit to the edit boundary."George Mount2012-06-193-3/+37
|\ \ \ \ \ \ \
| * | | | | | | Clip selected text within scrollable edit to the edit boundary.George Mount2012-06-183-3/+37
| |/ / / / / /
* | | | | | | am d548db16: Reconcile with jb-releaseThe Android Open Source Project2012-06-190-0/+0
|\ \ \ \ \ \ \ | |/ / / / / / |/| / / / / / | |/ / / / /
| * | | | | 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
| | | | |\ \ \
* | | | | \ \ \ Merge "When swapping, immediately start processing new work"Chris Craik2012-06-151-1/+7
|\ \ \ \ \ \ \ \
| * | | | | | | | When swapping, immediately start processing new workChris Craik2012-06-151-1/+7
* | | | | | | | | Merge "Remove unused and fix build warning"John Reck2012-06-153-22/+4
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Remove unused and fix build warningJohn Reck2012-06-143-22/+4
* | | | | | | | | | am 56b62670: (-s ours) am 4dd92d0a: DO NOT MERGE Respect the "Make password v...George Mount2012-06-140-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
| | | |/ / / / / | | |/| | | | |
* | | | | | | | Merge "Respect the "Make password visible" setting."George Mount2012-06-141-2/+6
|\ \ \ \ \ \ \ \ | |_|_|/ / / / / |/| | | | | | |
| * | | | | | | Respect the "Make password visible" setting.George Mount2012-06-141-2/+6
* | | | | | | | Merge "Show layer tree in hierarchyviewer"John Reck2012-06-1411-122/+239
|\ \ \ \ \ \ \ \ | |/ / / / / / / |/| | | | | | |
| * | | | | | | Show layer tree in hierarchyviewerJohn Reck2012-06-1411-122/+239
* | | | | | | | Add detailed tracing to tile paintingChris Craik2012-06-139-3/+40
|/ / / / / / /
* | | | | | | Merge "Revert "Revert "Add layer clip check to hide handles when not visible."""George Mount2012-06-121-0/+23
|\ \ \ \ \ \ \
| * | | | | | | Revert "Revert "Add layer clip check to hide handles when not visible.""George Mount2012-06-121-0/+23
* | | | | | | | am 101ff140: am b8dbaafe: Merge "Call the right updatePositions*" into jb-devJohn Reck2012-06-122-8/+8
|\ \ \ \ \ \ \ \ | | |/ / / / / / | |/| | | | | |
| * | | | | | | 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 d09512ae: am 9b2be716: Merge "Workaround double blit failure" into jb-devChris Craik2012-06-123-0/+12
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / / | | | | | | | | / | |_|_|_|_|_|_|/ |/| | | | | | |
| * | | | | | | 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 45476c6e: am a762e7bf: Crash fix by checking null pointerTeng-Hui Zhu2012-06-121-1/+1
|\ \ \ \ \ \ \ \ | |/ / / / / / /
| * | | | | | | 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
| | |/ / / / /
* | | | | | | Merge "Revert "Add layer clip check to hide handles when not visible.""George Mount2012-06-121-23/+0
|\ \ \ \ \ \ \ | | |_|_|/ / / | |/| | | | |
| * | | | | | Revert "Add layer clip check to hide handles when not visible."George Mount2012-06-121-23/+0
* | | | | | | Merge "Add layer clip check to hide handles when not visible."George Mount2012-06-121-0/+23
|\ \ \ \ \ \ \ | |/ / / / / /
| * | | | | | Add layer clip check to hide handles when not visible.George Mount2012-06-071-0/+23
* | | | | | | Merge "Fix edit text capturing selection."George Mount2012-06-122-23/+24
|\ \ \ \ \ \ \
| * | | | | | | Fix edit text capturing selection.George Mount2012-06-062-23/+24
* | | | | | | | am dc9e0296: (-s ours) am e0766f08: (-s ours) am 31874a9d: (-s ours) Merge "D...Geremy Condra2012-06-110-0/+0
|\ \ \ \ \ \ \ \ | | |_|/ / / / / | |/| | | | | |
| * | | | | | | 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 f8b2a5a3: am 7fc1c095: Merge "Remove forgotten CHROME_NETWORK_STACK macros...Selim Gurun2012-06-111-2/+0
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / /
| * | | | | | | | 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
* | | | | | | | | am 42fe1d5b: Reconcile with jb-releaseThe Android Open Source Project2012-06-110-0/+0
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / /