tree a9c81c2f5edf8af47f1a81a912277887f99addd8
parent 2761ce7a347c5dffb1aabf5ca7d2249f54b78c10
parent d7edf4108af4ae732715ec14340795da6206e302
author Chet Haase <chet@google.com> 1474685245 +0000
committer android-build-merger <android-build-merger@google.com> 1474685245 +0000

Merge "Revert "Set background on correct view"" into nyc-mr1-dev am: 0000262ec6 am: 7770e6c1ec
am: d7edf4108a

Change-Id: Iee4293b4210a5d100af4f9a49f7bcaeae4272d12