tree 6deb0f73301dde2c9db62c6f7d8b4b1a5dedae21
parent b37a03785a2bf23f1ea968bac06dfb32b021477b
parent 7e612db065bcbc36837703567ab395174d68473d
author Tao Bao <tbao@google.com> 1479281053 +0000
committer android-build-merger <android-build-merger@google.com> 1479281053 +0000

Merge changes from topic 'minui-cherrypick' am: d6137a2ae0 am: 38236d0f35 am: 2e55280df2
am: 7e612db065

Change-Id: Ifd99004890da01f89c4012645bb42a06f0cbb28a