tree 70d96e99ec327a6a6ef328193c6d880252668bc8
parent 040674586be7944aa33757d192648d047c3f48a2
parent 2de12da142af4dc8386ea3b6838d3e10ea9bf20a
author Tao Bao <tbao@google.com> 1525140243 -0700
committer android-build-merger <android-build-merger@google.com> 1525140243 -0700

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

Change-Id: I339621dbc9c8cebe78fa7bcf30e9c7e070e649af