tree c093a96e135d9c048dca319f8c236c29bc28d3f4
parent 917111eb41d3c445b3839bf5598cb4704102dd65
parent 1875991c71586c7902288dcb2dd323b75cc754d0
author Tao Bao <tbao@google.com> 1525301152 -0700
committer android-build-merger <android-build-merger@google.com> 1525301152 -0700

Merge "screen_ui: Drop the dependency on common.h." am: 738a4258d8 am: 30f2775b37
am: 1875991c71

Change-Id: I6995f59e2a6859d5b5d1e5cdf49c0f19261b829f