tree 52e11fefc8fb3bba21d1f993da16d6d8df8281d7
parent 97fffca6299fade340668946d659e57f39aa5e3a
parent edbe45baaece0084ea94900fa448027547749613
author Lucas Dupin <dupin@google.com> 1571185897 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 1571185897 +0000

Merge "Fade out display when prox or presence"