tree 65410f83e121df55cbdec80e9b2f746096810cf7
parent 9c29567c67dd35a0eaf2dd4e76097e8ed55cc338
parent 38236d0f35a67fe4fe305c7d73d1e46e0d99cb80
author Tao Bao <tbao@google.com> 1479280119 +0000
committer android-build-merger <android-build-merger@google.com> 1479280119 +0000

Merge changes from topic 'minui-cherrypick' am: d6137a2ae0
am: 38236d0f35

Change-Id: Ie197bb6e5ef67732be162c9cd2edb696576530d1