tree ab66d056dc2711ad3154e887776675204a0651ff
parent 1888ecb2cb8d0851ff137811c5e598ab19142096
parent 14bafef5b050f14c0fed3bfed8b137862139e627
author Dianne Hackborn <hackbod@google.com> 1438652277 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1438652277 +0000

am 14bafef5: am 24922798: am b20a8ed9: am d9b0f843: Merge "Fix issue #22860466: viapi security bug - rubber stamping in nested VIs" into mnc-dev

* commit '14bafef5b050f14c0fed3bfed8b137862139e627':
  Fix issue #22860466: viapi security bug - rubber stamping in nested VIs