OSDN Git Service

Merge "DO NOT MERGE - Also scale down thumbnail in app transitions for grid recents...
authorManu Cornet <manucornet@google.com>
Fri, 13 Jan 2017 02:42:05 +0000 (02:42 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Fri, 13 Jan 2017 02:42:05 +0000 (02:42 +0000)
am: 4c7317373c  -s ours

Change-Id: I7054561b72b89871318e17c2948c69a85bd654d5


Trivial merge