tree f1085f9f5dcf773ddc8e7b9f09b9a4549ef10ca4
parent 80099408c9324cf604c64f3b09996462835eabe0
parent 6208526a6d2b31848f9717a5e070061ea0d54e0d
author Android Build Merger (Role) <android-build-merger@google.com> 1464153636 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 1464153636 +0000

Merge "goldfish_setup: grant /system/bin/sh exec access am: 501c88c029 am: ce2e90308e" into nyc-mr1-dev-plus-aosp