tree 9579d514237288b9d42992356420278f8f591857
parent 6823c8a822167a2a362aaae7ee36644c6de0e309
parent 9f1885dee8fe5cbce8f7150ab8b26df6d363ac34
author Amith Yamasani <yamasani@google.com> 1528329289 -0700
committer android-build-merger <android-build-merger@google.com> 1528329289 -0700

Merge "DO NOT MERGE Fix security exception due to incorrect flags" into pi-dev
am: 9f1885dee8

Change-Id: Idb0ba52a58231ce9ede97b158a1cb38d1a9633ae