summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
...
| | | | | | | | | | |
| | \ \ \ \ \ \ \ \ \
| *-. \ \ \ \ \ \ \ \ \ Reconcile with jb-release nakasi-factoryrom-releaseThe Android Open Source Project2012-05-160-0/+0
| |\ \ \ \ \ \ \ \ \ \ \ | | |_|/ / / / / / / / / | |/| | | | | | / / / / | | | |_|_|_|_|/ / / / | | |/| | | | | / / / | | | | |_|_|_|/ / / | | | |/| | | | | | Change-Id: I868c989576e050037ba24ae1ac8fe95c0f4c3ed9
| | | * | | | | | | merge in nakasi-factoryrom-release history after reset to jb-devThe Android Automerger2012-05-160-0/+0
| | | |\ \ \ \ \ \ \ | | |/ / / / / / / / | |/| | | | | | | |
| | | * | | | | | | merge in nakasi-factoryrom-release history after reset to jb-devThe Android Automerger2012-05-150-0/+0
| | | |\ \ \ \ \ \ \
| | * | \ \ \ \ \ \ \ merge in jb-release history after reset to jb-devThe Android Automerger2012-05-160-0/+0
| | |\ \ \ \ \ \ \ \ \ | |/ / / / / / / / / /
| | * | | | | | | | | merge in jb-release history after reset to jb-devThe Android Automerger2012-05-150-0/+0
| | |\ \ \ \ \ \ \ \ \ | | | |/ / / / / / / / | | |/| / / / / / / / | | | |/ / / / / / /
| | | * | | | | | | merge in jb-release history after reset to jb-devThe Android Automerger2012-05-140-0/+0
| | | |\ \ \ \ \ \ \
| | | | * | | | | | | Ensure getFavicon() does not return uninitialized bitmaps.Jeff Brown2012-05-101-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | While a web page is loading, it may not have a favicon. We should return null in this case. Bug: 6467873 Change-Id: Id3ee882fdd59679f3cfddb739661e020a4463399
| | | | * | | | | | | merge in jb-release history after reset to jb-devThe Android Automerger2012-05-100-0/+0
| | | | |\ \ \ \ \ \ \
| | | | | * \ \ \ \ \ \ merge in jb-release history after reset to jb-devThe Android Automerger2012-05-090-0/+0
| | | | | |\ \ \ \ \ \ \
| | | | | | * \ \ \ \ \ \ merge in jb-release history after reset to jb-devThe Android Automerger2012-05-080-0/+0
| | | | | | |\ \ \ \ \ \ \
| | | | | | | * \ \ \ \ \ \ merge in jb-release history after reset to jb-devThe Android Automerger2012-05-070-0/+0
| | | | | | | |\ \ \ \ \ \ \
| | | | | | | | * \ \ \ \ \ \ merge in jb-release history after reset to jb-devThe Android Automerger2012-05-040-0/+0
| | | | | | | | |\ \ \ \ \ \ \
| | | | | | | | | * \ \ \ \ \ \ merge in jb-release history after reset to jb-devThe Android Automerger2012-05-030-0/+0
| | | | | | | | | |\ \ \ \ \ \ \
| | | | | | | | | | * | | | | | | Don't create a new functor if old one existsChris Craik2012-05-021-3/+13
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | bug:6405861 Change-Id: Ife0dcc6416b18bbd50b4d244e6464f423f651de6
| | | | | | | | | | * | | | | | | merge in jb-release history after reset to jb-devThe Android Automerger2012-05-020-0/+0
| | | | | | | | | | |\ \ \ \ \ \ \
| | | | | | | | | | | * \ \ \ \ \ \ merge in jb-release history after reset to jb-devThe Android Automerger2012-05-010-0/+0
| | | | | | | | | | | |\ \ \ \ \ \ \
| | | | | | | | | | | | * \ \ \ \ \ \ merge in jb-release history after reset to jb-devThe Android Automerger2012-04-300-0/+0
| | | | | | | | | | | | |\ \ \ \ \ \ \
| | | | | | | | | | | | | * \ \ \ \ \ \ merge in jb-release history after reset to jb-devThe Android Automerger2012-04-260-0/+0
| | | | | | | | | | | | | |\ \ \ \ \ \ \
| | | | | | | | | | | | | | * \ \ \ \ \ \ merge in jb-release history after reset to jb-devThe Android Automerger2012-04-250-0/+0
| | | | | | | | | | | | | | |\ \ \ \ \ \ \
| | | | | | | | | | | | | | | * \ \ \ \ \ \ merge in jb-release history after reset to masterThe Android Automerger2012-04-240-0/+0
| | | | | | | | | | | | | | | |\ \ \ \ \ \ \
| | | | | | | | | | | | | | | | * \ \ \ \ \ \ merge in jb-release history after reset to masterThe Android Automerger2012-04-230-0/+0
| | | | | | | | | | | | | | | | |\ \ \ \ \ \ \
| | | | | | | | | | | | | | | | | * \ \ \ \ \ \ merge in jb-release history after reset to masterThe Android Automerger2012-04-190-0/+0
| | | | | | | | | | | | | | | | | |\ \ \ \ \ \ \
| | | | | | | | | | | | | | | | | | * | | | | | | Follow the new rule from framework about EGLContext deletionTeng-Hui Zhu2012-04-181-2/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | bug:6325463 Change-Id: I303e2cf08feec110bd75c95f1de8ebc2e79f3c4c
| | | | | | | | | | | | | | | | | | * | | | | | | merge in jb-release history after reset to masterThe Android Automerger2012-04-180-0/+0
| | | | | | | | | | | | | | | | | | |\ \ \ \ \ \ \
| | | | | | | | | | | | | | | | | | | * \ \ \ \ \ \ merge in jb-release history after reset to masterThe Android Automerger2012-04-170-0/+0
| | | | | | | | | | | | | | | | | | | |\ \ \ \ \ \ \
| | | | | | | | | | | | | | | | | | | | * | | | | | | Revert "Cherry-pick WebKit change r92139 to fix a LayoutTest crash"Teng-Hui Zhu2012-04-162-14/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This was causing HTML5 video to crash. bug:6342146 This reverts commit d60e027437c746fb2412aef1c1cad6b1347c1b5e. Change-Id: I15893f6c49bba2f0f738590d29c8b0c9024a98e6
| | | | | | | | | | | | | | | | | | | | * | | | | | | Revert "Turn on Fence sync for transfer queue."Chris Craik2012-04-161-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Was causing ANRs bug:6325463 This reverts commit 79620b0826fdbb2f0d125042f1414391b51fc5fa
| | | | | | | | | | | | | | | | | | | | * | | | | | | merge in jb-release history after reset to masterThe Android Automerger2012-04-160-0/+0
| | | | | | | | | | | | | | | | | | | | |\ \ \ \ \ \ \
| | | | | | | | | | | | | | | | | | | | | * \ \ \ \ \ \ merge in jb-release history after reset to masterThe Android Automerger2012-04-120-0/+0
| | | | | | | | | | | | | | | | | | | | | |\ \ \ \ \ \ \
| | | | | | | | | | | | | | | | | | | | | | * \ \ \ \ \ \ merge in jb-release history after reset to masterThe Android Automerger2012-04-110-0/+0
| | | | | | | | | | | | | | | | | | | | | | |\ \ \ \ \ \ \
| | | | | | | | | | | | | | | | | | | | | | | * \ \ \ \ \ \ merge in jb-release history after reset to masterThe Android Automerger2012-04-100-0/+0
| | | | | | | | | | | | | | | | | | | | | | | |\ \ \ \ \ \ \
| | | | | | | | | | | | | | | | | | | | | | | | * \ \ \ \ \ \ merge in jb-release history after reset to masterThe Android Automerger2012-04-090-0/+0
| | | | | | | | | | | | | | | | | | | | | | | | |\ \ \ \ \ \ \
| | | | | | | | | | | | | | | | | | | | | | | | | * \ \ \ \ \ \ merge in jb-release history after reset to masterThe Android Automerger2012-04-050-0/+0
| | | | | | | | | | | | | | | | | | | | | | | | | |\ \ \ \ \ \ \
| | | | | | | | | | | | | | | | | | | | | | | | | | * \ \ \ \ \ \ merge in jb-release history after reset to masterThe Android Automerger2012-04-040-0/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | |\ \ \ \ \ \ \
| | | | | | | | | | | | | | | | | | | | | | | | | | | * \ \ \ \ \ \ merge in jb-release history after reset to masterThe Android Automerger2012-04-030-0/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | |\ \ \ \ \ \ \
| | | | | | | | | | | | | | | | | | | | | | | | | | | | * \ \ \ \ \ \ merge in jb-release history after reset to masterThe Android Automerger2012-04-020-0/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | |\ \ \ \ \ \ \
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | * \ \ \ \ \ \ merge in jb-release history after reset to masterThe Android Automerger2012-03-290-0/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | |\ \ \ \ \ \ \
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * \ \ \ \ \ \ merge in jb-release history after reset to masterThe Android Automerger2012-03-280-0/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |\ \ \ \ \ \ \
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * \ \ \ \ \ \ merge in jb-release history after reset to masterThe Android Automerger2012-03-270-0/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |\ \ \ \ \ \ \
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * \ \ \ \ \ \ merge in jb-release history after reset to masterThe Android Automerger2012-03-260-0/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |\ \ \ \ \ \ \
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * \ \ \ \ \ \ merge in jb-release history after reset to masterThe Android Automerger2012-03-210-0/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |\ \ \ \ \ \ \
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * \ \ \ \ \ \ merge in jb-release history after reset to masterThe Android Automerger2012-03-200-0/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |\ \ \ \ \ \ \
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * \ \ \ \ \ \ merge in jb-release history after reset to masterThe Android Automerger2012-03-200-0/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |/ / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |/| | | | | | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * | | | | | | | merge in jb-release history after reset to masterThe Android Automerger2012-03-190-0/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |\ \ \ \ \ \ \ \
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * \ \ \ \ \ \ \ merge in jb-release history after reset to masterThe Android Automerger2012-03-150-0/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |\ \ \ \ \ \ \ \
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * \ \ \ \ \ \ \ merge in jb-release history after reset to masterThe Android Automerger2012-03-140-0/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |\ \ \ \ \ \ \ \
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * \ \ \ \ \ \ \ merge in jb-release history after reset to masterThe Android Automerger2012-03-130-0/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |\ \ \ \ \ \ \ \
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * \ \ \ \ \ \ \ merge in jb-release history after reset to masterThe Android Automerger2012-03-120-0/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |\ \ \ \ \ \ \ \
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * \ \ \ \ \ \ \ merge in jb-release history after reset to masterThe Android Automerger2012-03-080-0/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |\ \ \ \ \ \ \ \
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * \ \ \ \ \ \ \ merge in jb-release history after reset to masterThe Android Automerger2012-03-070-0/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |\ \ \ \ \ \ \ \