tree f28d9f1615b2e67490da0a8c1a820c9e68e81d66
parent dee3f94ef48e1788519fce0b16beb14d41e17df7
parent 625cc92c3dbfec8d8b6e873cfeb54166f4d2b1f3
author Brandon Maxwell <maxwelb@google.com> 1458243127 +0000
committer android-build-merger <android-build-merger@google.com> 1458243127 +0000

Merge "Fixing securityException issue" into nyc-dev am: 3d7939d
am: 625cc92

* commit '625cc92c3dbfec8d8b6e873cfeb54166f4d2b1f3':
  Fixing securityException issue