tree 40af5026c22268ade9527148efbbf9ba46e776f7
parent d6f0a3213965ebbc1808693c047f7202cdd8a36e
parent 81e8bdd420d00c8b60616743b47d2170d1ff2ea8
author Manu Cornet <manucornet@google.com> 1484783812 +0000
committer android-build-merger <android-build-merger@google.com> 1484783812 +0000

Merge "2D Recents: use a different background color for drop targets" into nyc-mr2-dev
am: 81e8bdd420

Change-Id: I74ca6532c4aa223fc7f5e80532dd0a261c9f4bba