tree e9a629c466525b8d371ffde452ef8fb3f2c3d4f7
parent f745906adc41e846dc00ca08202347ff4bb9554b
parent 2fb6609c318f1ba8ee75194c5cbc6de982a0a5a7
author Sunny Goyal <sunnygoyal@google.com> 1413837891 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1413837891 +0000

am 2fb6609c: Merge "Showing widgets in a disabled state, when running in safe mode" into ub-now-queens

* commit '2fb6609c318f1ba8ee75194c5cbc6de982a0a5a7':
  Showing widgets in a disabled state, when running in safe mode