tree 69965e0637a6c04e6b8672093959916ba84f87df
parent f51754a8b9876ed4dc16a873811097f2d854f759
parent 28459ffde38855c2792594316a4217f02a9ea827
author Tao Bao <tbao@google.com> 1505160052 +0000
committer android-build-merger <android-build-merger@google.com> 1505160052 +0000

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

Change-Id: I46b6b0c9211a862c88d950681ac3fc304f993f97