summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* 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.0Steve Kondik2016-03-1010-36/+10
|\
| * Import translations. DO NOT MERGEGeoff Mendal2015-10-260-0/+0
| |\
| | * Import translations. DO NOT MERGEGeoff Mendal2015-10-261-1/+1
| * | Import translations. DO NOT MERGEGeoff Mendal2015-10-210-0/+0
| |\|
| | * Import translations. DO NOT MERGEGeoff Mendal2015-10-219-10/+23
| * | Merge remote-tracking branch \'goog/lmp-mr1-ub-dev\' into mnc-dev am: a082f08...Qiwen Zhao2015-10-200-0/+0
| |\|
| | * Merge remote-tracking branch \'goog/lmp-mr1-ub-dev\' into mnc-dev am: a082f08797Qiwen Zhao2015-10-200-0/+0
| | |\
| | | * Merge remote-tracking branch \'goog/lmp-mr1-ub-dev\' into mnc-devQiwen Zhao2015-10-200-0/+0
| | | |\
| | | | * Merge remote-tracking branch 'goog/lmp-mr1-ub-dev' into mnc-devQiwen Zhao2015-10-190-0/+0
| | | | |\
| | | | | * am 12399ba4: Fix WebView targetSDK checks.Ben Murdoch2015-05-202-6/+15
| | | | | |\
| | | | | | * Fix WebView targetSDK checks.Ben Murdoch2014-11-172-6/+15
| | | | | * | am 446ce2c2: (-s ours) Add support for SmartClip interface in the glue layer.Ben Murdoch2015-04-260-0/+0
| | | | | |\ \
| | | | | | * | Add support for SmartClip interface in the glue layer.Ben Murdoch2014-11-042-1/+24
| | | | | * | | am ddbcc035: (-s ours) Always add the path to the WebView assets.Ben Murdoch2015-04-260-0/+0
| | | | | |\| |
| | | | | | * | Always add the path to the WebView assets.Ben Murdoch2014-10-281-0/+3
| | | | | * | | am 2b22e3a2: Merge "Add version code support for mips64."Richard Coles2015-03-121-0/+3
| | | | | |\ \ \
| | | | | | * \ \ Merge "Add version code support for mips64."Richard Coles2015-03-121-0/+3
| | | | | | |\ \ \
| | | | | | | * | | Add version code support for mips64.Douglas Leung2015-02-261-0/+3
| | | | | * | | | | am f2e74977: am 4a38c0de: Merge "Revert "Implement stub functions""Selim Gurun2015-03-031-12/+0
| | | | | |\| | | |
| | | | | | * | | | am 4a38c0de: Merge "Revert "Implement stub functions""Selim Gurun2015-03-031-12/+0
| | | | | | |\ \ \ \
| | | | | | | * \ \ \ Merge "Revert "Implement stub functions""Selim Gurun2015-03-031-12/+0
| | | | | | | |\ \ \ \
| | | | | | | | * | | | Revert "Implement stub functions"Selim Gurun2015-03-031-12/+0
| | | | | * | | | | | | am 8898ecf7: am 7ed31a7d: Merge "Implement stub functions"Selim Gurun2015-03-021-0/+12
| | | | | |\| | | | | |
| | | | | | * | | | | | am 7ed31a7d: Merge "Implement stub functions"Selim Gurun2015-03-021-0/+12
| | | | | | |\| | | | |
| | | | | | | * | | | | Merge "Implement stub functions"Selim Gurun2015-03-021-0/+12
| | | | | | | |\| | | | | | | | | | | | |/ / / | | | | | | | |/| | |
| | | | | | | | * | | Implement stub functionsSelim Gurun2015-03-021-0/+12
| | | | | | | |/ / /
| | | | | * | | | | am 20135337: (-s ours) Import translations. DO NOT MERGEGeoff Mendal2015-02-270-0/+0
| | | | | |\| | | |
| | | | | | * | | | Import translations. DO NOT MERGEGeoff Mendal2015-02-261-2/+2
| | | | | |/ / / /
| | | | | * | | | am a770a09c: Merge "Fix remaining references to hidden fields."Martin Kosiba2014-12-050-0/+0
| | | | | |\| | |
| | | | | | * | | Merge "Fix remaining references to hidden fields."Martin Kosiba2014-12-052-3/+3
| | | | | | |\ \ \
| | | | | | | * | | Fix remaining references to hidden fields.Torne (Richard Coles)2014-12-052-3/+3
| | | | | | |/ / /
| | | | | * | | | resolved conflicts for merge of 83f6e3db to lmp-mr1-dev-plus-aospNarayan Kamath2014-11-271-3/+0
| | | | | |\| | |
| | | | | | * | | Merge "Track move of android.net.http.ErrorStrings."Narayan Kamath2014-11-271-8/+1
| | | | | | |\ \ \
| | | | | | | * | | Track move of android.net.http.ErrorStrings.Narayan Kamath2014-11-271-8/+1
| | | | | | |/ / /
| | | | | * | | | resolved conflicts for merge of d83e7f76 to lmp-mr1-dev-plus-aospTorne (Richard Coles)2014-11-201-1/+2
| | | | | |\| | |
| | | | | | * | | Merge internal glue layer to AOSP at c28cfda.Torne (Richard Coles)2014-11-209-131/+511
| | | | | | |\ \ \
| | | | | * | | | | resolved conflicts for merge of 4e0495ed to lmp-mr1-dev-plus-aospTorne (Richard Coles)2014-11-1927-20/+255
| | | | | |\| | | |
| | | | | | * | | | Merge glue layer up to 7f6067d into AOSP.Torne (Richard Coles)2014-11-1889-393/+1832
| | | | | | |\ \ \ \
| | | | | * | \ \ \ \ Merge correct version of glue layer.Torne (Richard Coles)2014-11-17147-574/+2122
| | | | | |\ \ \ \ \ \
| | | | | | * | | | | | Merge AOSP master into M39 glue layer code.Torne (Richard Coles)2014-11-172-19/+20
| | | | | | |\| | | | | | | | | | | | |_|_|_|/ | | | | | | |/| | | |
| | | | | | * | | | | Merge "Add support for SmartClip interface in the glue layer." into m39Ben Murdoch2014-11-132-1/+24
| | | | | | |\ \ \ \ \
| | | | | | | * | | | | Add support for SmartClip interface in the glue layer.Ben Murdoch2014-11-122-1/+24
| | | | | | * | | | | | [WebView] Start building against the System SDK.Ignacio Solla2014-11-104-8/+5
| | | | | | * | | | | | [WebView] Remove direct dependencies on hidden APIs.Ignacio Solla2014-11-106-83/+444
| | | | | | |/ / / / /
| | | | | | * | | | | [WebView] Remove unused method in CookieManagerIgnacio Solla2014-11-061-4/+6
| | | | | | * | | | | Merge "[WebView] Remove dependencies on DebugFlags." into m39Ignacio Solla2014-11-032-42/+42
| | | | | | |\ \ \ \ \
| | | | | | | * | | | | [WebView] Remove dependencies on DebugFlags.Ignacio Solla2014-11-032-42/+42
| | | | | | * | | | | | [WebView] Remove dependency on Build.IS_DEBUGGABLE.Ignacio Solla2014-10-311-1/+5
| | | | | | |/ / / / /
| | | | | | * | | | | Merge "[WebView] Remove dependency on FileUtils." into m39Ignacio Solla2014-10-291-2/+15
| | | | | | |\ \ \ \ \
| | | | | | | * | | | | [WebView] Remove dependency on FileUtils.Ignacio Solla2014-10-291-2/+15