GitLab

am ce7dd45a: Fix the BigDecimal documentation to not be a copy & paste of the BigInteger documentation.

* commit 'ce7dd45a':
  Fix the BigDecimal documentation to not be a copy & paste of the BigInteger documentation.

* commit 'a7e616b1':
  Fix the SimpleDateFormat L/M E/c documentation.

Also do some other documentation clean-up. In particular, it's confusing
to use ^ to mean exponentiation when the language uses it to mean
exclusive-or.

(cherry-pick of 995e3c8d.)

Bug: https://code.google.com/p/android/issues/detail?id=54103
Change-Id: I704bb4d29ea27664adcba6579eabbccd3782b6b1

(cherry-pick of 498df39c.)

Change-Id: I04c1957955fc8cf9af9374264a0266ad61334795

am b6733c9a: am 9799c2a0: am e68c13c0: am 300cde36: Merge "Remove support for duplicate file entries." into jb-dev

* commit 'b6733c9a':

am e8dd1040: am 4aaa292a: am 160dd055: am 4beeee87: Revert "Remove support for duplicate file entries."

* commit 'e8dd1040':

* commit 'a99d26b7':

* commit 'd7ee1e53':

am 9799c2a0: am e68c13c0: am 300cde36: Merge "Remove support for duplicate file entries." into jb-dev

* commit '9799c2a0':
  Remove support for duplicate file entries.

am 9799c2a0: am e68c13c0: am 300cde36: Merge "Remove support for duplicate file entries." into jb-dev

* commit '9799c2a0':
  Remove support for duplicate file entries.

* commit 'e68c13c0':
  Remove support for duplicate file entries.

* commit '300cde36':
  Remove support for duplicate file entries.

* commit '4aaa292a':
  Revert "Remove support for duplicate file entries."

* commit '4aaa292a':
  Revert "Remove support for duplicate file entries."

* commit '160dd055':
  Revert "Remove support for duplicate file entries."

* commit '4beeee87':
  Revert "Remove support for duplicate file entries."

Bug: 8219321
Change-Id: Ibc56bea753917c38e1bb20df48aa45fdff39d364

This reverts commit 5360af4a

Ugh, forgot that make wouldn't make the tests anymore. We're missing the ZipException, I'll reupload in a second.

Change-Id: I8b4d7300cffa1f9f23235e2e33a1cf2b522ba3f3

* commit '843b12a8':
  Remove support for duplicate file entries.

* commit '843b12a8':
  Remove support for duplicate file entries.

* commit '6b26de17':
  Remove support for duplicate file entries.

* commit '5360af4a':
  Remove support for duplicate file entries.

Bug: 8219321
Change-Id: I4ac47f8facf13afa45799a0d5e20202a0ef5f0c6

* commit '60998d47':

* commit '60998d47':

* commit '52e40b6d':
  DO NOT MERGE

* commit '446c6e7c':
  DO NOT MERGE

* commit 'a0d32add':
  DO NOT MERGE

Disable SSL compression

Bug: 7079965

Change-Id: I8e060a827613e212bbcced66507fbf124bb04543

	modified:   luni/src/main/java/libcore/net/http/HttpConnection.java
	modified:   luni/src/main/java/org/apache/harmony/xnet/provider/jsse/NativeCrypto.java
	modified:   luni/src/main/java/org/apache/harmony/xnet/provider/jsse/OpenSSLServerSocketImpl.java
	modified:   luni/src/main/java/org/apache/harmony/xnet/provider/jsse/OpenSSLSessionImpl.java
	modified:   luni/src/main/java/org/apache/harmony/xnet/provider/jsse/OpenSSLSocketImpl.java
	modified:   luni/src/main/native/org_apache_harmony_xnet_provider_jsse_NativeCrypto.cpp
	modified:   luni/src/test/java/org/apache/harmony/xnet/provider/jsse/NativeCryptoTest.java

Central directories of zip files should be read lazily.
They are needed only to service calls to
BaseDexClassLoader#findResouce(s). Most android processes
don't use these methods since they use android resources.

bug:6797061

Change-Id: I1a5b5d03572601707e1fb1fd4424c1ae2fd2217d

Change-Id: I1e5f377e655f72b8d2e497e83cf4207f5b786e01

Bug: 7378963
Change-Id: I45fb1350baaf591e59b78bb3cf97091667cb079c

Bug: 7453821
Change-Id: I69408d0bb4063e34441ed1d7632fd1ccac39965b

Bug: 7355008
Change-Id: Ifdedca5cf5c96c86f94a0deead61e1798d1a495f