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)
commitacb31abf069dbbeb139904719c6aa0b08ec37aad
treeac9e75efbf1f81a1fa7aa075615970872179d94e
parent939f3a3823529512d608fbd0d7a5d31663aa353a
parent8a25b25da1d3157e6d8bb517a2a678bd74b7d1d3
[automerger skipped] Merge "Add config to disable app tray preview in display size." am: 98a1ebedcd  -s ours am: 4e8e6c3e67
am: 8a25b25da1  -s ours

Change-Id: I0c0d0f338a724cec812d7fcc7e2bc521fc673a35