tree cab94c341e186473ca8e00395ca01e0eaaa0302a
parent 7ded841365bdc77520d97c6771c777d9381b5210
parent a2639d47ee2b0706c8714f9af55177a6b8940cb2
author Felipe Leme <felipeal@google.com> 1504462221 +0000
committer android-build-merger <android-build-merger@google.com> 1504462221 +0000

Merge "Fixed dumpstate_test_fixture so it runs on 64 bits as well." into oc-mr1-dev
am: a2639d47ee

Change-Id: I6b34107fb6de6b4bc183a4485458248b5e10a259