tree 71f60c4680c6764b6adce56579f4d3ce1dbb6506
parent c2f6ebf15b3ae3deb9a3ac916898296e37f2a514
parent d6137a2ae057b28226bb7bad6ba00707217f1019
author Tao Bao <tbao@google.com> 1479279648 +0000
committer android-build-merger <android-build-merger@google.com> 1479279648 +0000

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

Change-Id: Ieac34e2de3334f66b99e50b88e1d51adbb649603