tree 65410f83e121df55cbdec80e9b2f746096810cf7
parent 1b6584340ef4795b460eaa4d4d26b112f2724f7b
parent 2e55280df2d24c07cc81599b3c56c5965d578803
author Tao Bao <tbao@google.com> 1479280570 +0000
committer android-build-merger <android-build-merger@google.com> 1479280570 +0000

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

Change-Id: I293fcb31472db3d2aaa91df7ec17b0e5e8f6e461