tree 0fed570a3e44896286726dbaffa3462e907be1ea
parent c3674ab1b2ab409bdc931a4d99e2456d395cb416
parent 7e6119125834b7c9bc9acc5a6beaf73d3c2630a2
author Tao Bao <tbao@google.com> 1525140587 -0700
committer android-build-merger <android-build-merger@google.com> 1525140587 -0700

Merge "Drop '#include "ui.h"' from device.h." am: 2de12da142
am: 7e61191258

Change-Id: I1db9c680ccbaa877a2c730541133436c16f7d467