commit | 60b836b0e84fda9dfb415e2628958e593d02c7fd | [log] [tgz] |
---|---|---|
author | Robert Shih <robertshih@google.com> | Wed Sep 11 21:55:56 2019 -0700 |
committer | android-build-merger <android-build-merger@google.com> | Wed Sep 11 21:55:56 2019 -0700 |
tree | 9b3b616fe3cc5563187449d90956fec78dff8910 | |
parent | 7f4dfda4e10f66f9e58eb435cb116127c326b4b1 [diff] | |
parent | 562e4f15b5235d4db8de4d69a77cfb6ef2234e54 [diff] |
Merge "[automerger skipped] default hidl CryptoPlugin: security fixes [RESTRICT AUTOMERGE] am: d22f1447fe am: 756f134fcc am: f6e7c9ed25 -s ours am: fe72b76df1 -s ours am: 5cfbc4ba16 am: 7063ed4b46 am: 3a65eb77da" into qt-qpr1-dev-plus-aosp am: 562e4f15b5 -s ours am skip reason: subject contains skip directive Change-Id: I69020a812baac1b89309ce2c9cfe5734be9cb22e