tree 5f57dd9051a00eb6fdbf307323b18aeb4136d8d4
parent 3ef42ba6d68aeda0c52b936da3196804365c4452
parent 64c4e01e7d4c0257f074ad03e149474a4f19d086
author Andre Eisenbach <eisenbach@google.com> 1418749512 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1418749512 +0000

am 64c4e01e: am ff125cce: Merge "Prevent duplicate OPP permission request dialogs" into lmp-mr1-dev

* commit '64c4e01e7d4c0257f074ad03e149474a4f19d086':
  Prevent duplicate OPP permission request dialogs