tree 8d561387d94ef5397098fc4f907b7904c3fe0d89
parent d83ebf9270e90d9306ad4eaf6837dea91ca3b172
parent 0bfccebc9b276b857c992790232cc8477a8a3504
author Adam Cohen <adamcohen@google.com> 1397696032 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 1397696032 +0000

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