tree 514db86712eb6427c1a94cf09517a03e6acd1336
parent 8654a3cb26c3dea3c2d70e3a254eaf257e29cc48
parent 2f018c0603473dceed07413f5fdc3ac697a2f990
author Ray Essick <essick@google.com> 1569871718 -0700
committer android-build-merger <android-build-merger@google.com> 1569871718 -0700

Merge "Added CMakeLists.txt for x86/x64 build"
am: 2f018c0603

Change-Id: I37416cdb199055382460e5a9e7595f397e544d1c