OSDN Git Service

[automerger skipped] Merge "HwBlob: s/malloc/calloc/" into oc-dev am: 123ffb6202...
authorSteven Moreland <smoreland@google.com>
Wed, 8 May 2019 22:20:53 +0000 (15:20 -0700)
committerandroid-build-merger <android-build-merger@google.com>
Wed, 8 May 2019 22:20:53 +0000 (15:20 -0700)
commit0d04871fb3831f1e2fc1f8aeb5058477821a6c74
tree7b1b0bef9d7f110b508a4708f0045dbdf87cfa79
parenta8a18f6d3237b622305ad4e55b37f59acd9cafb7
parentb8ff385796be315a4ebce72ed415fdf2961edcb3
[automerger skipped] Merge "HwBlob: s/malloc/calloc/" into oc-dev am: 123ffb6202 am: f489aed3c1 am: 96f4f9e2e9
am: b8ff385796 -s ours
am skip reason: change_id I48f4d7cb20c4bfe747dd323ae3744d323ad097c9 with SHA1 05c973aeb6 is in history

Change-Id: I489b4dc1cfc80e35b126fa1e2c811dc1b6228772