OSDN Git Service

Merge "DO NOT MERGE Fix security vulnerability in pre-O rild code." into nyc-dev...
authorSanket Padawe <sanketpadawe@google.com>
Thu, 10 Aug 2017 05:07:56 +0000 (05:07 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Thu, 10 Aug 2017 05:07:56 +0000 (05:07 +0000)
am: 7421b551d3

Change-Id: I8499af4e1a16435bf9720ed9a0970b54fd2f0ab5


Trivial merge