tree 09d84530072c7ab3902668dacb7795df3b8f3f08
parent 04b0d0368892f226337adae6e82677cb2b6c64ee
parent 76ac344cb61a74267c04249c9e9feec41a82c504
author Adam Cohen <adamcohen@google.com> 1397856743 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1397856743 +0000

am 76ac344c: Merge "Allow the old launcher content URI to be overrided" into ub-now-mister-ugly

* commit '76ac344cb61a74267c04249c9e9feec41a82c504':
  Allow the old launcher content URI to be overrided