tree 8b96b765b725f5c421e8c8725b020d7d3338b0ce
parent 36e3388bdcb89d7e996d2474b8d4241c791473f0
parent 4cc6889da84dfeca64f84ef4685c6e319e018d90
author Tao Bao <tbao@google.com> 1493492126 +0000
committer android-build-merger <android-build-merger@google.com> 1493492126 +0000

Merge "minui: Fix breakage in graphics_adf." am: 54da112277 am: d66f05b82c
am: 4cc6889da8

Change-Id: Id405586d2ff8a94a49c9cb649483dbb7ec645fd1