summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorQiwen Zhao <zhao@google.com>2015-10-20 01:12:08 +0000
committerandroid-build-merger <android-build-merger@google.com>2015-10-20 01:12:08 +0000
commitf5deeec57f4caaca1478dafa567c7d13df1cfa17 (patch)
tree1dbb552d888c0d348bd75b56b0b774163917200a
parentaf710f265a2502289955875c1810f4f825370da6 (diff)
parenta082f08797d44164d1c735b4f0a9d4f94b1d1410 (diff)
downloadwebview-f5deeec57f4caaca1478dafa567c7d13df1cfa17.tar.gz
Merge remote-tracking branch \'goog/lmp-mr1-ub-dev\' into mnc-devmarshmallow-mr1-dev
am: a082f08797 * commit 'a082f08797d44164d1c735b4f0a9d4f94b1d1410': (120 commits) Revert "Implement stub functions" Implement stub functions Add version code support for mips64. Import translations. DO NOT MERGE Fix remaining references to hidden fields. Track move of android.net.http.ErrorStrings. Fix WebView targetSDK checks. Add support for SmartClip interface in the glue layer. [WebView] Start building against the System SDK. [WebView] Remove direct dependencies on hidden APIs. [WebView] Remove unused method in CookieManager Add support for SmartClip interface in the glue layer. [WebView] Remove dependencies on DebugFlags. [WebView] Remove dependency on Build.IS_DEBUGGABLE. Import translations. DO NOT MERGE Revert "Wrap one more Context" [WebView] Remove dependency on FileUtils. Always add the path to the WebView assets. Always add the path to the WebView assets. Remove DRP manager code ...
0 files changed, 0 insertions, 0 deletions