OSDN Git Service

[automerger skipped] Merge "Add config to disable app tray preview in display size...
authorFan Zhang <zhfan@google.com>
Tue, 11 Sep 2018 20:41:17 +0000 (13:41 -0700)
committerandroid-build-merger <android-build-merger@google.com>
Tue, 11 Sep 2018 20:41:17 +0000 (13:41 -0700)
am: 8a25b25da1  -s ours

Change-Id: I0c0d0f338a724cec812d7fcc7e2bc521fc673a35


Trivial merge