Commit message (Collapse) | Author | Age | Files | Lines | ||
---|---|---|---|---|---|---|
... | ||||||
| | | | | | | | | | | | ||||||
| | \ \ \ \ \ \ \ \ \ | ||||||
| *-. \ \ \ \ \ \ \ \ \ | Reconcile with jb-release nakasi-factoryrom-release | The Android Open Source Project | 2012-05-16 | 0 | -0/+0 | |
| |\ \ \ \ \ \ \ \ \ \ \ | | |_|/ / / / / / / / / | |/| | | | | | / / / / | | | |_|_|_|_|/ / / / | | |/| | | | | / / / | | | | |_|_|_|/ / / | | | |/| | | | | | | Change-Id: I868c989576e050037ba24ae1ac8fe95c0f4c3ed9 | |||||
| | | * | | | | | | | merge in nakasi-factoryrom-release history after reset to jb-dev | The Android Automerger | 2012-05-16 | 0 | -0/+0 | |
| | | |\ \ \ \ \ \ \ | | |/ / / / / / / / | |/| | | | | | | | | ||||||
| | | * | | | | | | | merge in nakasi-factoryrom-release history after reset to jb-dev | The Android Automerger | 2012-05-15 | 0 | -0/+0 | |
| | | |\ \ \ \ \ \ \ | ||||||
| | * | \ \ \ \ \ \ \ | merge in jb-release history after reset to jb-dev | The Android Automerger | 2012-05-16 | 0 | -0/+0 | |
| | |\ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / | ||||||
| | * | | | | | | | | | merge in jb-release history after reset to jb-dev | The Android Automerger | 2012-05-15 | 0 | -0/+0 | |
| | |\ \ \ \ \ \ \ \ \ | | | |/ / / / / / / / | | |/| / / / / / / / | | | |/ / / / / / / | ||||||
| | | * | | | | | | | merge in jb-release history after reset to jb-dev | The Android Automerger | 2012-05-14 | 0 | -0/+0 | |
| | | |\ \ \ \ \ \ \ | ||||||
| | | | * | | | | | | | Ensure getFavicon() does not return uninitialized bitmaps. | Jeff Brown | 2012-05-10 | 1 | -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-dev | The Android Automerger | 2012-05-10 | 0 | -0/+0 | |
| | | | |\ \ \ \ \ \ \ | ||||||
| | | | | * \ \ \ \ \ \ | merge in jb-release history after reset to jb-dev | The Android Automerger | 2012-05-09 | 0 | -0/+0 | |
| | | | | |\ \ \ \ \ \ \ | ||||||
| | | | | | * \ \ \ \ \ \ | merge in jb-release history after reset to jb-dev | The Android Automerger | 2012-05-08 | 0 | -0/+0 | |
| | | | | | |\ \ \ \ \ \ \ | ||||||
| | | | | | | * \ \ \ \ \ \ | merge in jb-release history after reset to jb-dev | The Android Automerger | 2012-05-07 | 0 | -0/+0 | |
| | | | | | | |\ \ \ \ \ \ \ | ||||||
| | | | | | | | * \ \ \ \ \ \ | merge in jb-release history after reset to jb-dev | The Android Automerger | 2012-05-04 | 0 | -0/+0 | |
| | | | | | | | |\ \ \ \ \ \ \ | ||||||
| | | | | | | | | * \ \ \ \ \ \ | merge in jb-release history after reset to jb-dev | The Android Automerger | 2012-05-03 | 0 | -0/+0 | |
| | | | | | | | | |\ \ \ \ \ \ \ | ||||||
| | | | | | | | | | * | | | | | | | Don't create a new functor if old one exists | Chris Craik | 2012-05-02 | 1 | -3/+13 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | bug:6405861 Change-Id: Ife0dcc6416b18bbd50b4d244e6464f423f651de6 | |||||
| | | | | | | | | | * | | | | | | | merge in jb-release history after reset to jb-dev | The Android Automerger | 2012-05-02 | 0 | -0/+0 | |
| | | | | | | | | | |\ \ \ \ \ \ \ | ||||||
| | | | | | | | | | | * \ \ \ \ \ \ | merge in jb-release history after reset to jb-dev | The Android Automerger | 2012-05-01 | 0 | -0/+0 | |
| | | | | | | | | | | |\ \ \ \ \ \ \ | ||||||
| | | | | | | | | | | | * \ \ \ \ \ \ | merge in jb-release history after reset to jb-dev | The Android Automerger | 2012-04-30 | 0 | -0/+0 | |
| | | | | | | | | | | | |\ \ \ \ \ \ \ | ||||||
| | | | | | | | | | | | | * \ \ \ \ \ \ | merge in jb-release history after reset to jb-dev | The Android Automerger | 2012-04-26 | 0 | -0/+0 | |
| | | | | | | | | | | | | |\ \ \ \ \ \ \ | ||||||
| | | | | | | | | | | | | | * \ \ \ \ \ \ | merge in jb-release history after reset to jb-dev | The Android Automerger | 2012-04-25 | 0 | -0/+0 | |
| | | | | | | | | | | | | | |\ \ \ \ \ \ \ | ||||||
| | | | | | | | | | | | | | | * \ \ \ \ \ \ | merge in jb-release history after reset to master | The Android Automerger | 2012-04-24 | 0 | -0/+0 | |
| | | | | | | | | | | | | | | |\ \ \ \ \ \ \ | ||||||
| | | | | | | | | | | | | | | | * \ \ \ \ \ \ | merge in jb-release history after reset to master | The Android Automerger | 2012-04-23 | 0 | -0/+0 | |
| | | | | | | | | | | | | | | | |\ \ \ \ \ \ \ | ||||||
| | | | | | | | | | | | | | | | | * \ \ \ \ \ \ | merge in jb-release history after reset to master | The Android Automerger | 2012-04-19 | 0 | -0/+0 | |
| | | | | | | | | | | | | | | | | |\ \ \ \ \ \ \ | ||||||
| | | | | | | | | | | | | | | | | | * | | | | | | | Follow the new rule from framework about EGLContext deletion | Teng-Hui Zhu | 2012-04-18 | 1 | -2/+3 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | bug:6325463 Change-Id: I303e2cf08feec110bd75c95f1de8ebc2e79f3c4c | |||||
| | | | | | | | | | | | | | | | | | * | | | | | | | merge in jb-release history after reset to master | The Android Automerger | 2012-04-18 | 0 | -0/+0 | |
| | | | | | | | | | | | | | | | | | |\ \ \ \ \ \ \ | ||||||
| | | | | | | | | | | | | | | | | | | * \ \ \ \ \ \ | merge in jb-release history after reset to master | The Android Automerger | 2012-04-17 | 0 | -0/+0 | |
| | | | | | | | | | | | | | | | | | | |\ \ \ \ \ \ \ | ||||||
| | | | | | | | | | | | | | | | | | | | * | | | | | | | Revert "Cherry-pick WebKit change r92139 to fix a LayoutTest crash" | Teng-Hui Zhu | 2012-04-16 | 2 | -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 Craik | 2012-04-16 | 1 | -1/+1 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Was causing ANRs bug:6325463 This reverts commit 79620b0826fdbb2f0d125042f1414391b51fc5fa | |||||
| | | | | | | | | | | | | | | | | | | | * | | | | | | | merge in jb-release history after reset to master | The Android Automerger | 2012-04-16 | 0 | -0/+0 | |
| | | | | | | | | | | | | | | | | | | | |\ \ \ \ \ \ \ | ||||||
| | | | | | | | | | | | | | | | | | | | | * \ \ \ \ \ \ | merge in jb-release history after reset to master | The Android Automerger | 2012-04-12 | 0 | -0/+0 | |
| | | | | | | | | | | | | | | | | | | | | |\ \ \ \ \ \ \ | ||||||
| | | | | | | | | | | | | | | | | | | | | | * \ \ \ \ \ \ | merge in jb-release history after reset to master | The Android Automerger | 2012-04-11 | 0 | -0/+0 | |
| | | | | | | | | | | | | | | | | | | | | | |\ \ \ \ \ \ \ | ||||||
| | | | | | | | | | | | | | | | | | | | | | | * \ \ \ \ \ \ | merge in jb-release history after reset to master | The Android Automerger | 2012-04-10 | 0 | -0/+0 | |
| | | | | | | | | | | | | | | | | | | | | | | |\ \ \ \ \ \ \ | ||||||
| | | | | | | | | | | | | | | | | | | | | | | | * \ \ \ \ \ \ | merge in jb-release history after reset to master | The Android Automerger | 2012-04-09 | 0 | -0/+0 | |
| | | | | | | | | | | | | | | | | | | | | | | | |\ \ \ \ \ \ \ | ||||||
| | | | | | | | | | | | | | | | | | | | | | | | | * \ \ \ \ \ \ | merge in jb-release history after reset to master | The Android Automerger | 2012-04-05 | 0 | -0/+0 | |
| | | | | | | | | | | | | | | | | | | | | | | | | |\ \ \ \ \ \ \ | ||||||
| | | | | | | | | | | | | | | | | | | | | | | | | | * \ \ \ \ \ \ | merge in jb-release history after reset to master | The Android Automerger | 2012-04-04 | 0 | -0/+0 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | |\ \ \ \ \ \ \ | ||||||
| | | | | | | | | | | | | | | | | | | | | | | | | | | * \ \ \ \ \ \ | merge in jb-release history after reset to master | The Android Automerger | 2012-04-03 | 0 | -0/+0 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | |\ \ \ \ \ \ \ | ||||||
| | | | | | | | | | | | | | | | | | | | | | | | | | | | * \ \ \ \ \ \ | merge in jb-release history after reset to master | The Android Automerger | 2012-04-02 | 0 | -0/+0 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | |\ \ \ \ \ \ \ | ||||||
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | * \ \ \ \ \ \ | merge in jb-release history after reset to master | The Android Automerger | 2012-03-29 | 0 | -0/+0 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | |\ \ \ \ \ \ \ | ||||||
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * \ \ \ \ \ \ | merge in jb-release history after reset to master | The Android Automerger | 2012-03-28 | 0 | -0/+0 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |\ \ \ \ \ \ \ | ||||||
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * \ \ \ \ \ \ | merge in jb-release history after reset to master | The Android Automerger | 2012-03-27 | 0 | -0/+0 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |\ \ \ \ \ \ \ | ||||||
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * \ \ \ \ \ \ | merge in jb-release history after reset to master | The Android Automerger | 2012-03-26 | 0 | -0/+0 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |\ \ \ \ \ \ \ | ||||||
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * \ \ \ \ \ \ | merge in jb-release history after reset to master | The Android Automerger | 2012-03-21 | 0 | -0/+0 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |\ \ \ \ \ \ \ | ||||||
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * \ \ \ \ \ \ | merge in jb-release history after reset to master | The Android Automerger | 2012-03-20 | 0 | -0/+0 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |\ \ \ \ \ \ \ | ||||||
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * \ \ \ \ \ \ | merge in jb-release history after reset to master | The Android Automerger | 2012-03-20 | 0 | -0/+0 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |/ / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |/| | | | | | | | ||||||
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * | | | | | | | | merge in jb-release history after reset to master | The Android Automerger | 2012-03-19 | 0 | -0/+0 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |\ \ \ \ \ \ \ \ | ||||||
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * \ \ \ \ \ \ \ | merge in jb-release history after reset to master | The Android Automerger | 2012-03-15 | 0 | -0/+0 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |\ \ \ \ \ \ \ \ | ||||||
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * \ \ \ \ \ \ \ | merge in jb-release history after reset to master | The Android Automerger | 2012-03-14 | 0 | -0/+0 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |\ \ \ \ \ \ \ \ | ||||||
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * \ \ \ \ \ \ \ | merge in jb-release history after reset to master | The Android Automerger | 2012-03-13 | 0 | -0/+0 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |\ \ \ \ \ \ \ \ | ||||||
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * \ \ \ \ \ \ \ | merge in jb-release history after reset to master | The Android Automerger | 2012-03-12 | 0 | -0/+0 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |\ \ \ \ \ \ \ \ | ||||||
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * \ \ \ \ \ \ \ | merge in jb-release history after reset to master | The Android Automerger | 2012-03-08 | 0 | -0/+0 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |\ \ \ \ \ \ \ \ | ||||||
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * \ \ \ \ \ \ \ | merge in jb-release history after reset to master | The Android Automerger | 2012-03-07 | 0 | -0/+0 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |\ \ \ \ \ \ \ \ |