tree 0c26102a4278f1c69e2d8d5d3d1242ed3f116249
parent e8b8d30a99d54a9905ef2622832628530b41341e
parent 10c111ed35a0282ddf5dda540c53e3831bc9b0ec
author Svet Ganov <svetoslavganov@google.com> 1436198225 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1436198225 +0000

am 10c111ed: Merge "Show basic feature warning for default granted permissions" into mnc-dev

* commit '10c111ed35a0282ddf5dda540c53e3831bc9b0ec':
  Show basic feature warning for default granted permissions