tree 00c7d7761e96229a147d4f59078d6a9cae2ce13c
parent 6a403370b4cf377e80fa586dde3648a593693b44
parent 3da888d17c020b39ba36dbc99b681bf3339d269f
author Sunny Goyal <sunnygoyal@google.com> 1416536366 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1416536366 +0000

am 3da888d1: Merge "Disabling auto addition of managed profile shortcuts" into ub-now-queens

* commit '3da888d17c020b39ba36dbc99b681bf3339d269f':
  Disabling auto addition of managed profile shortcuts