OSDN Git Service

[automerger skipped] Merge "DO NOT MERGE Set click listeners on displayPreference...
authorBeverly <beverlyt@google.com>
Fri, 18 May 2018 22:58:19 +0000 (15:58 -0700)
committerandroid-build-merger <android-build-merger@google.com>
Fri, 18 May 2018 22:58:19 +0000 (15:58 -0700)
commit76507e06b6b266685712fcc738535a89917e87cb
tree2fb9324a7130a3aa0c24ce1bf0c3bea3ecc91fef
parent93a2b1e8938334192c05e88620852701b9adf2c5
parent9c6ccfbb4a9d45ced752fc11f414969f025e01bf
[automerger skipped] Merge "DO NOT MERGE Set click listeners on displayPreference" into pi-dev am: cf845f365c
am: 9c6ccfbb4a  -s ours

Change-Id: Ie2482ef0da93306300b1c15e6a1cec8fff4d43b5