tree c093a96e135d9c048dca319f8c236c29bc28d3f4
parent f0fd4f59836c4631c9d5736de384e8f014eccc25
parent 30f2775b373f0beab29cbc5c5d58f971b8b9bce3
author Tao Bao <tbao@google.com> 1525297796 -0700
committer android-build-merger <android-build-merger@google.com> 1525297796 -0700

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

Change-Id: Id553c1f1de86fa292c0327f6fcc00fb8cd17bec3