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:05 +0000 (05:07 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Thu, 10 Aug 2017 05:07:05 +0000 (05:07 +0000)
am: 96582369cb  -s ours

Change-Id: I735190aa455f534de7ce20e1c85b3439a99e4cc4


Trivial merge