| commit | aa20aa9d2a90e97f571b5b821b13d92c9f571d7b | [log] [tgz] |
|---|---|---|
| author | Hall Liu <hallliu@google.com> | Fri Nov 08 17:39:33 2019 -0800 |
| committer | android-build-merger <android-build-merger@google.com> | Fri Nov 08 17:39:33 2019 -0800 |
| tree | b0ff0a959e729738e6f258d92b1cf7bbd7897971 | |
| parent | 0f47896db050b1da90cc5afcf70d50770dbae754 [diff] | |
| parent | 71d16a2c725b9a7a6a67ec2740fb1c20a60bdca4 [diff] |
[automerger skipped] Merge changes from topic "tp-master-security" am: ce68570fa6 am: 1c8960a480 am: 71d16a2c72 -s ours am skip reason: change_id Ia7be0ecdfca5e7adf6163dc015a413a98f1b9287 with SHA1 c0712379c7 is in history Change-Id: I0340336934439ed86e34a4734e41507bd5134a71