tree 526bfa3027116ad6c5e3860960816059885df516
parent a94e999652837db65b99e5e49390dfcabb2006fa
parent 60a0d5a24ce8956686b0581d2d5e56a83417d403
author Alexander Smundak <asmundak@google.com> 1590012614 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1590012614 +0000

Merge "Convert tests/ProtoInputStreamTests/Android.mk file to Android.bp" am: 4497c97891 am: 3036f3d732 am: 44dc35f254 am: 734ef1be41 am: 60a0d5a24c

Change-Id: Ifee61a3040c59872cf7777e469c9beb27b5517f5