tree af72f53372f61edb68eb2a84f9624619fcc01466
parent 6ab00addb18ab2950edb74e1510cc44646f55ff0
parent b0608636a29bcec8ecb4391cd50f29f68b3e7e81
author TreeHugger Robot <treehugger-gerrit@google.com> 1494474934 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 1494474940 +0000

Merge "Add uniqueId to Virtual Display and pass through to inputflinger (1/2)" into oc-dev