tree ad35047727b5f720e5756ea4609b13a7f614e176
parent c254da26a607bb0af01915ef441c40dac25ffa09
parent 2a66bbf3f01c2be20ecbf9df4dd9e98d50ed119f
author Sunny Goyal <sunnygoyal@google.com> 1416535807 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 1416535810 +0000

Merge "Disabling auto addition of managed profile shortcuts" into ub-now-queens