tree 09d84530072c7ab3902668dacb7795df3b8f3f08
parent 8f97daa93e7795708cb491f72b84ee1cb3ba3f04
parent a8171169ff18efc9e0bf5b865dbd35cee06d3fae
author Adam Cohen <adamcohen@google.com> 1398177332 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1398177332 +0000

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

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