OSDN Git Service

Merge "DO NOT MERGE Fix security exception due to incorrect flags" into pi-dev
authorAmith Yamasani <yamasani@google.com>
Wed, 6 Jun 2018 23:54:49 +0000 (16:54 -0700)
committerandroid-build-merger <android-build-merger@google.com>
Wed, 6 Jun 2018 23:54:49 +0000 (16:54 -0700)
am: 9f1885dee8

Change-Id: Idb0ba52a58231ce9ede97b158a1cb38d1a9633ae


Trivial merge