tree 52115f2b5d3320b242a6923003b9e97864a64fc3
parent 3616adceea7b9b241747a7aa76b8f5d945608ec1
parent cce9b2c96a3e1b8ed636c433a9fa5887890b2f1f
author Tao Bao <tbao@google.com> 1505158581 +0000
committer android-build-merger <android-build-merger@google.com> 1505158581 +0000

Merge "ui: Remove text_top_." am: 568644197f am: d96ce15139
am: cce9b2c96a

Change-Id: Ic55e5c34c7f3af84c85d0a261af9c0fc2ec4e652