tree 5fbaf54481426503a0998d7b48473f6c6b63eaa4
parent 1bafe67c7855673c163483bedf8e304b9b75ec44
parent abc8d2d1fe46e7a46d9bf5c6b429f4ccc1b4ddbd
author Xin Li <delphij@google.com> 1547161939 -0800
committer android-build-merger <android-build-merger@google.com> 1547161939 -0800

Merge "Fix compile time warning." am: 5c6e4acbe1 am: 317da495e0
am: abc8d2d1fe

Change-Id: Ia1371744ffcc6bbdb14c836d72a84d45e5cc1b94