tree 80fbaa783f7b9ad8efed0f4f6303c0409b746150
parent 4d9ce1aa502c625e101cd91fe9b26aa8bfb2d26f
parent 16a4cbe79b3b8a010f783a4ea7121f90a844cc0a
author Tianjie Xu <xunchang@google.com> 1509995233 +0000
committer android-build-merger <android-build-merger@google.com> 1509995233 +0000

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

Change-Id: I14a680c82316c97818d6fdea1b5ec96ad79bcdf3