tree 89f19a28bf7c76c39a94e00d5d0e2e6c4570f20e
parent c8efa5b87fb2fd294aec9be04891a2111a709958
parent 230fc4621ef6787b1e2693273823e94c1380a107
author Janis Danisevskis <jdanis@google.com> 1634150353 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1634150353 +0000

[automerger skipped] DO NOT MERGE KeyStore ChunkedStreamer must tolerate update consuming 0 bytes. am: 395e56a71c am: b7c5457ce8 -s ours am: 908d3fae61 -s ours am: 8a0a38ebf1 -s ours am: f707c44d82 -s ours am: 230fc4621e -s ours

am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15900956

Change-Id: Ic1c73fdc11444493fafefc996ff67f8639afa230