OSDN Git Service

Merge "DO NOT MERGE Fix security vulnerability in pre-O rild code. am: bb6567cbaf...
authorSanket Padawe <sanketpadawe@google.com>
Thu, 10 Aug 2017 04:39:45 +0000 (04:39 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Thu, 10 Aug 2017 04:39:45 +0000 (04:39 +0000)
am: 7c4ff2aaa2  -s ours

Change-Id: Ieb6bb4301f1a914686990f88231d60b89010ec53


Trivial merge