tree 5be7ae63d5e93ee7c7dc7ac5e84993f85771fd98
parent a84f2669c1c84372e8a90c2eeecbe02a3f1907d2
parent 51cd50d7f1649f4bdea42483503810735555868e
author Sunny Goyal <sunnygoyal@google.com> 1434138007 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1434138007 +0000

am 51cd50d7: Merge "Using content provider to update launcher settings" into ub-launcher3-burnaby

* commit '51cd50d7f1649f4bdea42483503810735555868e':
  Using content provider to update launcher settings