tree 44a790f353b8e31b2a6b4283346a2c3acc928679
parent d2524d00c284e1c7d3735d6ce49e49ed90d223fc
parent 35a075db60bc5553b57ef3311b9643d3b04ea7da
author Nick Kralevich <nnk@google.com> 1440543183 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1440543183 +0000

am 35a075db: am 36d91b53: Merge "Only allow toolbox exec where /system exec was already allowed."

* commit '35a075db60bc5553b57ef3311b9643d3b04ea7da':
  Only allow toolbox exec where /system exec was already allowed.