| commit | 59e9d1ec5fee084b0348ffe8348cba40134f8b76 | [log] [tgz] |
|---|---|---|
| author | Android Build Merger (Role) <android-build-merger@google.com> | Thu Aug 10 04:36:31 2017 +0000 |
| committer | Android (Google) Code Review <android-gerrit@google.com> | Thu Aug 10 04:36:31 2017 +0000 |
| tree | 5a94a6309ce2b9b5d0478083906ce5b149ea9e12 | |
| parent | 7c4ff2aaa2fa7594cfbf7431b5e8b89635dc9828 [diff] | |
| parent | 8f8a80994737697e516c38a27e6658ea26336cd1 [diff] |
Merge "Merge "DO NOT MERGE Fix security vulnerability in pre-O rild code. am: bb6567cbaf am: 57170e4964 am: 44fd51827a -s ours am: 023b8082b7 -s ours am: 774711be8f am: 39840dc5e3 -s ours am: 3a546ebf0a am: 8ad718398a am: 472cfd25ea am: 2a86c777ef -s ours am: b916a4067b am: 21e26b21ee am: 52858488cd am: bd35fe83b0 am: 915b6f46e3 -s ours am: 20df21ecc7 am: 9a469ee216" into oc-dr1-dev-plus-aosp am: f985cb6db8" into oc-mr1-dev-plus-aosp