tree 4690c24741a66096b22048a3bbbdc29fd72bb741
parent 03460fc7e2478e545efc7fa988c77e508ebb2baf
parent 3a5859779a2692e7f25ff48052e6439d19202404
author Android Build Merger (Role) <noreply-android-build-merger@google.com> 1528925802 +0000
committer Android Build Merger (Role) <noreply-android-build-merger@google.com> 1528925802 +0000

[automerger skipped] Merge "Fix gray out previously connected device preference issue" into pi-dev am: 2ffa711cd1  -s ours skipped: 3a5859779a

Change-Id: I7bfd420524778f682d1836ca21c49361e5330ae7