tree dcdaa2827a2b9e3362b2c26770e2bae9cc70cc5e
parent a043fa89211541c71b5bef052ebc49f722d338b9
parent cdc4dbd878a1f45d21c2881127cd5194e4e48ced
author Sunny Goyal <sunnygoyal@google.com> 1406210925 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 1406141091 +0000

Merge "Adding options in the partner apk to disable the default wallpaper and provide a folder containing additional wallpapers" into ub-now-master