<feed xmlns='http://www.w3.org/2005/Atom'>
<title>platform_external_protobuf/java, branch androidx-sqlite-release</title>
<subtitle>Unnamed repository; edit this file 'description' to name the repository.
</subtitle>
<link rel='alternate' type='text/html' href='https://git.replicant.us/mirrors/AOSP/platform_external_protobuf/'/>
<entry>
<title>Update stubs</title>
<updated>2019-09-06T20:59:47+00:00</updated>
<author>
<name>Colin Cross</name>
<email>ccross@android.com</email>
</author>
<published>2018-10-10T23:28:32+00:00</published>
<link rel='alternate' type='text/html' href='https://git.replicant.us/mirrors/AOSP/platform_external_protobuf/commit/?id=f3c1b635c0a243d8f6db264ee30c290b617e48c4'/>
<id>f3c1b635c0a243d8f6db264ee30c290b617e48c4</id>
<content type='text'>
The java proto runtime requires more methods in sun.misc.Unsafe
to compile.

Bug: 117607748
Test: m checkbuild
Change-Id: I8e1c6265dd29d9b38ec87988fb9ed213e26706d6
Merged-In: I8e1c6265dd29d9b38ec87988fb9ed213e26706d6
</content>
<content type='xhtml'>
<div xmlns='http://www.w3.org/1999/xhtml'>
<pre>
The java proto runtime requires more methods in sun.misc.Unsafe
to compile.

Bug: 117607748
Test: m checkbuild
Change-Id: I8e1c6265dd29d9b38ec87988fb9ed213e26706d6
Merged-In: I8e1c6265dd29d9b38ec87988fb9ed213e26706d6
</pre>
</div>
</content>
</entry>
<entry>
<title>Merge tag 'v3.9.1' into master</title>
<updated>2019-09-06T20:59:11+00:00</updated>
<author>
<name>Colin Cross</name>
<email>ccross@android.com</email>
</author>
<published>2019-08-14T01:32:52+00:00</published>
<link rel='alternate' type='text/html' href='https://git.replicant.us/mirrors/AOSP/platform_external_protobuf/commit/?id=e949bf9b4039fee67caf3e4e5a2e5847f30601e4'/>
<id>e949bf9b4039fee67caf3e4e5a2e5847f30601e4</id>
<content type='text'>
Bug: 117607748
Test: m checkbuild
Change-Id: Ia6553278cfea2a8328937c3eebcd0f4fa2018eac
Merged-In: Ia6553278cfea2a8328937c3eebcd0f4fa2018eac
</content>
<content type='xhtml'>
<div xmlns='http://www.w3.org/1999/xhtml'>
<pre>
Bug: 117607748
Test: m checkbuild
Change-Id: Ia6553278cfea2a8328937c3eebcd0f4fa2018eac
Merged-In: Ia6553278cfea2a8328937c3eebcd0f4fa2018eac
</pre>
</div>
</content>
</entry>
<entry>
<title>Re-apply merge of tag v3.5.2</title>
<updated>2019-09-05T21:44:01+00:00</updated>
<author>
<name>Colin Cross</name>
<email>ccross@android.com</email>
</author>
<published>2019-08-14T01:26:41+00:00</published>
<link rel='alternate' type='text/html' href='https://git.replicant.us/mirrors/AOSP/platform_external_protobuf/commit/?id=3ed2fc523734b00b1779665e3adbe46139d10407'/>
<id>3ed2fc523734b00b1779665e3adbe46139d10407</id>
<content type='text'>
v3.5.2 was previously merged in Ia1b9174f7e3ac5c2d86ea7370d5c6c3ef1a37300
and then reverted as part of Ia04c0b15ebd45e8c7e02edaa6e1f10aeb11ef337,
which leaves v3.5.2 in the history but v3.0.0-beta3 in the tree.  Reapply
the merge to v3.5.2 so that v3.9.1 can be merged on top of it.

Bug: 117607748
Test: m checkbuild
Change-Id: I77a2c0638b00487d3acfbf3c0d634f26caf5b9be
Merged-In: I77a2c0638b00487d3acfbf3c0d634f26caf5b9be
</content>
<content type='xhtml'>
<div xmlns='http://www.w3.org/1999/xhtml'>
<pre>
v3.5.2 was previously merged in Ia1b9174f7e3ac5c2d86ea7370d5c6c3ef1a37300
and then reverted as part of Ia04c0b15ebd45e8c7e02edaa6e1f10aeb11ef337,
which leaves v3.5.2 in the history but v3.0.0-beta3 in the tree.  Reapply
the merge to v3.5.2 so that v3.9.1 can be merged on top of it.

Bug: 117607748
Test: m checkbuild
Change-Id: I77a2c0638b00487d3acfbf3c0d634f26caf5b9be
Merged-In: I77a2c0638b00487d3acfbf3c0d634f26caf5b9be
</pre>
</div>
</content>
</entry>
<entry>
<title>Update protobuf version (#6472)</title>
<updated>2019-08-05T17:07:28+00:00</updated>
<author>
<name>Paul Yang</name>
<email>TeBoring@users.noreply.github.com</email>
</author>
<published>2019-08-05T17:07:28+00:00</published>
<link rel='alternate' type='text/html' href='https://git.replicant.us/mirrors/AOSP/platform_external_protobuf/commit/?id=655310ca192a6e3a050e0ca0b7084a2968072260'/>
<id>655310ca192a6e3a050e0ca0b7084a2968072260</id>
<content type='text'>
</content>
<content type='xhtml'>
<div xmlns='http://www.w3.org/1999/xhtml'>
<pre>
</pre>
</div>
</content>
</entry>
<entry>
<title>Disable javadoc error (#6371)</title>
<updated>2019-07-23T19:57:08+00:00</updated>
<author>
<name>Paul Yang</name>
<email>TeBoring@users.noreply.github.com</email>
</author>
<published>2019-07-23T19:57:08+00:00</published>
<link rel='alternate' type='text/html' href='https://git.replicant.us/mirrors/AOSP/platform_external_protobuf/commit/?id=fce361354b5495261d79c680c9104c81703f2471'/>
<id>fce361354b5495261d79c680c9104c81703f2471</id>
<content type='text'>
* Disable javadoc error

Actual fixes of the javadoc will be followed up

* Remove duplicated configuration

* Update javadoc plugin version
</content>
<content type='xhtml'>
<div xmlns='http://www.w3.org/1999/xhtml'>
<pre>
* Disable javadoc error

Actual fixes of the javadoc will be followed up

* Remove duplicated configuration

* Update javadoc plugin version
</pre>
</div>
</content>
</entry>
<entry>
<title>Update protobuf version (#6366)</title>
<updated>2019-07-11T14:52:05+00:00</updated>
<author>
<name>Paul Yang</name>
<email>TeBoring@users.noreply.github.com</email>
</author>
<published>2019-07-11T14:52:05+00:00</published>
<link rel='alternate' type='text/html' href='https://git.replicant.us/mirrors/AOSP/platform_external_protobuf/commit/?id=6a59a2ad1f61d9696092f79b6d74368b4d7970a3'/>
<id>6a59a2ad1f61d9696092f79b6d74368b4d7970a3</id>
<content type='text'>
</content>
<content type='xhtml'>
<div xmlns='http://www.w3.org/1999/xhtml'>
<pre>
</pre>
</div>
</content>
</entry>
<entry>
<title>Merge branch 'master' into 3.9.x</title>
<updated>2019-06-21T20:31:00+00:00</updated>
<author>
<name>Bo Yang</name>
<email>teboring@google.com</email>
</author>
<published>2019-06-21T20:31:00+00:00</published>
<link rel='alternate' type='text/html' href='https://git.replicant.us/mirrors/AOSP/platform_external_protobuf/commit/?id=d581c76063e3a4cf468febda2ce8221418f0b813'/>
<id>d581c76063e3a4cf468febda2ce8221418f0b813</id>
<content type='text'>
Conflicts:
	java/lite/pom.xml
	java/util/pom.xml
</content>
<content type='xhtml'>
<div xmlns='http://www.w3.org/1999/xhtml'>
<pre>
Conflicts:
	java/lite/pom.xml
	java/util/pom.xml
</pre>
</div>
</content>
</entry>
<entry>
<title>Merge remote-tracking branch 'origin/3.8.x'</title>
<updated>2019-06-21T04:01:45+00:00</updated>
<author>
<name>Bo Yang</name>
<email>teboring@google.com</email>
</author>
<published>2019-06-21T04:01:45+00:00</published>
<link rel='alternate' type='text/html' href='https://git.replicant.us/mirrors/AOSP/platform_external_protobuf/commit/?id=bc742640ef42666325cabf810faa0b4b2e069b12'/>
<id>bc742640ef42666325cabf810faa0b4b2e069b12</id>
<content type='text'>
</content>
<content type='xhtml'>
<div xmlns='http://www.w3.org/1999/xhtml'>
<pre>
</pre>
</div>
</content>
</entry>
<entry>
<title>Merge pull request #6246 from JLLeitschuh/patch-1</title>
<updated>2019-06-20T18:17:22+00:00</updated>
<author>
<name>Hao Nguyen</name>
<email>45579440+haon4@users.noreply.github.com</email>
</author>
<published>2019-06-20T18:17:22+00:00</published>
<link rel='alternate' type='text/html' href='https://git.replicant.us/mirrors/AOSP/platform_external_protobuf/commit/?id=0eb0aa5dc961f6109d30d02188033575c69f442e'/>
<id>0eb0aa5dc961f6109d30d02188033575c69f442e</id>
<content type='text'>
Compatibility tests pull artifacts over HTTPS</content>
<content type='xhtml'>
<div xmlns='http://www.w3.org/1999/xhtml'>
<pre>
Compatibility tests pull artifacts over HTTPS</pre>
</div>
</content>
</entry>
<entry>
<title>Merge pull request #6177 from cgrushko/master</title>
<updated>2019-06-20T18:15:08+00:00</updated>
<author>
<name>Hao Nguyen</name>
<email>45579440+haon4@users.noreply.github.com</email>
</author>
<published>2019-06-20T18:15:08+00:00</published>
<link rel='alternate' type='text/html' href='https://git.replicant.us/mirrors/AOSP/platform_external_protobuf/commit/?id=e992abd1f876a3213385fd76101c629ea64054ce'/>
<id>e992abd1f876a3213385fd76101c629ea64054ce</id>
<content type='text'>
Add `protobuf_java_lite` Bazel target</content>
<content type='xhtml'>
<div xmlns='http://www.w3.org/1999/xhtml'>
<pre>
Add `protobuf_java_lite` Bazel target</pre>
</div>
</content>
</entry>
</feed>
