commit | 8f8a80994737697e516c38a27e6658ea26336cd1 | [log] [tgz] |
---|---|---|
author | Sanket Padawe <sanketpadawe@google.com> | Thu Aug 10 04:36:24 2017 +0000 |
committer | android-build-merger <android-build-merger@google.com> | Thu Aug 10 04:36:24 2017 +0000 |
tree | 5a94a6309ce2b9b5d0478083906ce5b149ea9e12 | |
parent | 3a4519ffa5eb44572c43db594add7cdb3dbb2165 [diff] | |
parent | f985cb6db87b02b0388fa6fa1ab1e0a8a6071040 [diff] |
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 Change-Id: I6c03fe2f6e992b7c327b73e454380a8ed5066857