tree 83c6c404c88411815f5e6c1e482d27a75924e3d6
parent 9fde43a2e2a0b28c9787b9ac53feae9209d7a238
parent 73859adf80c94a377508a1d9ea8b6fa45a19f80f
author Adam Cohen <adamcohen@google.com> 1400713318 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1400713318 +0000

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

* commit '73859adf80c94a377508a1d9ea8b6fa45a19f80f':
  Revert "Debugging wallpaper stuff on production device (to be reverted once built)"