tree 8dcdd362cd898a703a62cacd0f9c0aae6c19e695
parent cd917ecf0abb011916e9d90f526a2eff454bc1e7
parent d649b5751c9b7f592efb3653cfee39aeda45677b
author Dianne Hackborn <hackbod@google.com> 1437006281 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1437006281 +0000

am d649b575: am f9aa4b4d: am 309f9d6e: am f6586cbd: Merge "Implement issue #22403908: Enable assistant to refuse context sharing" into mnc-dev

* commit 'd649b5751c9b7f592efb3653cfee39aeda45677b':
  Implement issue #22403908: Enable assistant to refuse context sharing