tree 5125f5536f0dad9fbd7c691e0b49a3e0b80a5a2c
parent e1cdf5253d8c61218fe3b308803408c04f71ffa3
parent f8dc557cf84ad90186e94d1ebe15f850a6edf2a0
author Adam Cohen <adamcohen@google.com> 1400713201 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 1400713202 +0000

Merge "Debugging wallpaper stuff on production device (to be reverted once built)" into ub-now-nova