tree a032e245f1885cd86522e47698b999549d7908cc
parent 5f4cfd3ab73f4d8173db05d7c94c098a06cd5f57
parent 75ee9fcde4d9e1be3883eba6c8d193db4375b052
author Michael Wright <michaelwr@google.com> 1409680484 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 1409680485 +0000

Merge "VirtualDisplay.Callbacks -> Callback" into lmp-dev