tree d55b958369bff65bb139ea59e34b487d2400058a
parent 401f8b693517499b3ff4ccfeb8d7cdd99dba6af4
parent b6a8454cd5a15234c961aa1a95fbf80a9f6b18b1
author Tao Bao <tbao@google.com> 1479280125 +0000
committer android-build-merger <android-build-merger@google.com> 1479280125 +0000

Merge "Update to new minui text API" am: 335502453d  -s ours
am: b6a8454cd5

Change-Id: I29a733b45b7393854363b4d3cf82462bad04dbf0