tree a9a7e7a70e52ac3f64c08e8bb99a9a907976a1b6
parent da62ff4218260b29eb3cdd4a4132ff0dc8179471
parent c1ab2bb5354354ad13da37dd2b664d861d9e2111
author Tianjie Xu <xunchang@google.com> 1509995074 +0000
committer android-build-merger <android-build-merger@google.com> 1509995074 +0000

Merge "Switch to bionic gtest in bootable/recovery" am: bf41f2aa23
am: c1ab2bb535

Change-Id: Ia85a412604b4af35d001236d5cef74acb9bc2229