Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge tag 'android-6.0.1_r22' of https://android.googlesource.com/platform/fr...HEADreplicant-6.0-0004-transitionreplicant-6.0-0004-rc6replicant-6.0-0004-rc5-transitionreplicant-6.0-0004-rc5replicant-6.0-0004-rc4replicant-6.0-0004-rc3replicant-6.0-0004-rc2replicant-6.0-0004-rc1replicant-6.0-0004replicant-6.0-0003replicant-6.0-0002replicant-6.0-0001staging/cm-13.0+r22stable/cm-13.0-ZNH5Ystable/cm-13.0-ZNH2KBstable/cm-13.0-ZNH2Kcm-13.0 | Steve Kondik | 2016-03-10 | 10 | -36/+10 |
|\ | |||||
| * | Import translations. DO NOT MERGE | Geoff Mendal | 2015-10-26 | 0 | -0/+0 |
| |\ | |||||
| | * | Import translations. DO NOT MERGE | Geoff Mendal | 2015-10-26 | 1 | -1/+1 |
| * | | Import translations. DO NOT MERGE | Geoff Mendal | 2015-10-21 | 0 | -0/+0 |
| |\| | |||||
| | * | Import translations. DO NOT MERGE | Geoff Mendal | 2015-10-21 | 9 | -10/+23 |
| * | | Merge remote-tracking branch \'goog/lmp-mr1-ub-dev\' into mnc-dev am: a082f08... | Qiwen Zhao | 2015-10-20 | 0 | -0/+0 |
| |\| | |||||
| | * | Merge remote-tracking branch \'goog/lmp-mr1-ub-dev\' into mnc-dev am: a082f08797 | Qiwen Zhao | 2015-10-20 | 0 | -0/+0 |
| | |\ | |||||
| | | * | Merge remote-tracking branch \'goog/lmp-mr1-ub-dev\' into mnc-dev | Qiwen Zhao | 2015-10-20 | 0 | -0/+0 |
| | | |\ | |||||
| | | | * | Merge remote-tracking branch 'goog/lmp-mr1-ub-dev' into mnc-dev | Qiwen Zhao | 2015-10-19 | 0 | -0/+0 |
| | | | |\ | |||||
| | | | | * | am 12399ba4: Fix WebView targetSDK checks. | Ben Murdoch | 2015-05-20 | 2 | -6/+15 |
| | | | | |\ | |||||
| | | | | | * | Fix WebView targetSDK checks. | Ben Murdoch | 2014-11-17 | 2 | -6/+15 |
| | | | | * | | am 446ce2c2: (-s ours) Add support for SmartClip interface in the glue layer. | Ben Murdoch | 2015-04-26 | 0 | -0/+0 |
| | | | | |\ \ | |||||
| | | | | | * | | Add support for SmartClip interface in the glue layer. | Ben Murdoch | 2014-11-04 | 2 | -1/+24 |
| | | | | * | | | am ddbcc035: (-s ours) Always add the path to the WebView assets. | Ben Murdoch | 2015-04-26 | 0 | -0/+0 |
| | | | | |\| | | |||||
| | | | | | * | | Always add the path to the WebView assets. | Ben Murdoch | 2014-10-28 | 1 | -0/+3 |
| | | | | * | | | am 2b22e3a2: Merge "Add version code support for mips64." | Richard Coles | 2015-03-12 | 1 | -0/+3 |
| | | | | |\ \ \ | |||||
| | | | | | * \ \ | Merge "Add version code support for mips64." | Richard Coles | 2015-03-12 | 1 | -0/+3 |
| | | | | | |\ \ \ | |||||
| | | | | | | * | | | Add version code support for mips64. | Douglas Leung | 2015-02-26 | 1 | -0/+3 |
| | | | | * | | | | | am f2e74977: am 4a38c0de: Merge "Revert "Implement stub functions"" | Selim Gurun | 2015-03-03 | 1 | -12/+0 |
| | | | | |\| | | | | |||||
| | | | | | * | | | | am 4a38c0de: Merge "Revert "Implement stub functions"" | Selim Gurun | 2015-03-03 | 1 | -12/+0 |
| | | | | | |\ \ \ \ | |||||
| | | | | | | * \ \ \ | Merge "Revert "Implement stub functions"" | Selim Gurun | 2015-03-03 | 1 | -12/+0 |
| | | | | | | |\ \ \ \ | |||||
| | | | | | | | * | | | | Revert "Implement stub functions" | Selim Gurun | 2015-03-03 | 1 | -12/+0 |
| | | | | * | | | | | | | am 8898ecf7: am 7ed31a7d: Merge "Implement stub functions" | Selim Gurun | 2015-03-02 | 1 | -0/+12 |
| | | | | |\| | | | | | | |||||
| | | | | | * | | | | | | am 7ed31a7d: Merge "Implement stub functions" | Selim Gurun | 2015-03-02 | 1 | -0/+12 |
| | | | | | |\| | | | | | |||||
| | | | | | | * | | | | | Merge "Implement stub functions" | Selim Gurun | 2015-03-02 | 1 | -0/+12 |
| | | | | | | |\| | | | | | | | | | | | |/ / / | | | | | | | |/| | | | |||||
| | | | | | | | * | | | Implement stub functions | Selim Gurun | 2015-03-02 | 1 | -0/+12 |
| | | | | | | |/ / / | |||||
| | | | | * | | | | | am 20135337: (-s ours) Import translations. DO NOT MERGE | Geoff Mendal | 2015-02-27 | 0 | -0/+0 |
| | | | | |\| | | | | |||||
| | | | | | * | | | | Import translations. DO NOT MERGE | Geoff Mendal | 2015-02-26 | 1 | -2/+2 |
| | | | | |/ / / / | |||||
| | | | | * | | | | am a770a09c: Merge "Fix remaining references to hidden fields." | Martin Kosiba | 2014-12-05 | 0 | -0/+0 |
| | | | | |\| | | | |||||
| | | | | | * | | | Merge "Fix remaining references to hidden fields." | Martin Kosiba | 2014-12-05 | 2 | -3/+3 |
| | | | | | |\ \ \ | |||||
| | | | | | | * | | | Fix remaining references to hidden fields. | Torne (Richard Coles) | 2014-12-05 | 2 | -3/+3 |
| | | | | | |/ / / | |||||
| | | | | * | | | | resolved conflicts for merge of 83f6e3db to lmp-mr1-dev-plus-aosp | Narayan Kamath | 2014-11-27 | 1 | -3/+0 |
| | | | | |\| | | | |||||
| | | | | | * | | | Merge "Track move of android.net.http.ErrorStrings." | Narayan Kamath | 2014-11-27 | 1 | -8/+1 |
| | | | | | |\ \ \ | |||||
| | | | | | | * | | | Track move of android.net.http.ErrorStrings. | Narayan Kamath | 2014-11-27 | 1 | -8/+1 |
| | | | | | |/ / / | |||||
| | | | | * | | | | resolved conflicts for merge of d83e7f76 to lmp-mr1-dev-plus-aosp | Torne (Richard Coles) | 2014-11-20 | 1 | -1/+2 |
| | | | | |\| | | | |||||
| | | | | | * | | | Merge internal glue layer to AOSP at c28cfda. | Torne (Richard Coles) | 2014-11-20 | 9 | -131/+511 |
| | | | | | |\ \ \ | |||||
| | | | | * | | | | | resolved conflicts for merge of 4e0495ed to lmp-mr1-dev-plus-aosp | Torne (Richard Coles) | 2014-11-19 | 27 | -20/+255 |
| | | | | |\| | | | | |||||
| | | | | | * | | | | Merge glue layer up to 7f6067d into AOSP. | Torne (Richard Coles) | 2014-11-18 | 89 | -393/+1832 |
| | | | | | |\ \ \ \ | |||||
| | | | | * | \ \ \ \ | Merge correct version of glue layer. | Torne (Richard Coles) | 2014-11-17 | 147 | -574/+2122 |
| | | | | |\ \ \ \ \ \ | |||||
| | | | | | * | | | | | | Merge AOSP master into M39 glue layer code. | Torne (Richard Coles) | 2014-11-17 | 2 | -19/+20 |
| | | | | | |\| | | | | | | | | | | | |_|_|_|/ | | | | | | |/| | | | | |||||
| | | | | | * | | | | | Merge "Add support for SmartClip interface in the glue layer." into m39 | Ben Murdoch | 2014-11-13 | 2 | -1/+24 |
| | | | | | |\ \ \ \ \ | |||||
| | | | | | | * | | | | | Add support for SmartClip interface in the glue layer. | Ben Murdoch | 2014-11-12 | 2 | -1/+24 |
| | | | | | * | | | | | | [WebView] Start building against the System SDK. | Ignacio Solla | 2014-11-10 | 4 | -8/+5 |
| | | | | | * | | | | | | [WebView] Remove direct dependencies on hidden APIs. | Ignacio Solla | 2014-11-10 | 6 | -83/+444 |
| | | | | | |/ / / / / | |||||
| | | | | | * | | | | | [WebView] Remove unused method in CookieManager | Ignacio Solla | 2014-11-06 | 1 | -4/+6 |
| | | | | | * | | | | | Merge "[WebView] Remove dependencies on DebugFlags." into m39 | Ignacio Solla | 2014-11-03 | 2 | -42/+42 |
| | | | | | |\ \ \ \ \ | |||||
| | | | | | | * | | | | | [WebView] Remove dependencies on DebugFlags. | Ignacio Solla | 2014-11-03 | 2 | -42/+42 |
| | | | | | * | | | | | | [WebView] Remove dependency on Build.IS_DEBUGGABLE. | Ignacio Solla | 2014-10-31 | 1 | -1/+5 |
| | | | | | |/ / / / / | |||||
| | | | | | * | | | | | Merge "[WebView] Remove dependency on FileUtils." into m39 | Ignacio Solla | 2014-10-29 | 1 | -2/+15 |
| | | | | | |\ \ \ \ \ | |||||
| | | | | | | * | | | | | [WebView] Remove dependency on FileUtils. | Ignacio Solla | 2014-10-29 | 1 | -2/+15 |