tree dfc4333f672561de249807c25d1fd2a74263db33
parent 2df4bb665d00ee6b7683ceb7b09fd8a4508f2254
parent 35e752ef62fa14e538da16afe520c541a3218a07
author Adam Powell <adamp@google.com> 1410737858 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1410737858 +0000

am fb24dbd6: am 51bf4916: am 86a3adca: Merge "Magic null-background filling for PhoneWindows" into lmp-dev

* commit 'fb24dbd64fe88856ac84d58e0e5c693254098780':
  Magic null-background filling for PhoneWindows